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

Change-Id: I6074971adc8b518c60ea72f0e4617e3111f0ebf4