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

Change-Id: I5ab10585ac02b21a08fcbd74b57e25ff7f38dcdc