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

Change-Id: I809dd59b78a73e04f14dc0d1a2f0b75272d364c3