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

Change-Id: I8ee178bd9188d7426b8743402c712131e23ef559