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

Change-Id: Icf29d4b558f82367afe666605bd6767bd9b39c7b