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

Change-Id: I79b0a352577e1f9c61a87187df7e0987237d6074