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

Change-Id: Iaecfc2d183d5a49097b2eb46da660761a046e50a