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

Change-Id: I90c5e2c28a623d406ce528303ede4c94e1629b78