Merge "Revert^2 "Merging from ub-launcher3-master @ build 6294827"" into rvc-dev am: 5bee1f934b am: e07ee21474 am: 577aaa6869 am: 1111cae1cf

Change-Id: I02a27183a4c2658218064bb55b503b8033df2783