Merge "Revert "Merging from ub-launcher3-master @ build 6294827"" into rvc-dev am: f7871fdb54 am: dc65170977 am: 7ba0287942

Change-Id: Ie2117ad2d01ba0144bf3792b7e5fe94ced175374