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

Change-Id: I1a231a571db48f0839383440f8d07b0c7d591680