Merge "Revert "Merging from ub-launcher3-master @ build 6294827"" into rvc-dev am: f7871fdb54 am: dc65170977

Change-Id: I3435be52662640b777e92563ed1910b44f32a92c