Merge "Revert^2 "Merging from ub-launcher3-master @ build 6294827"" into rvc-dev am: 5bee1f934b am: e07ee21474 am: 577aaa6869

Change-Id: Iac164e4ca83019f62937217eb5a9303b8db269c2