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

Change-Id: If845ebb96abdb69ff689fd4fabe8105d7a75f397