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

Change-Id: I1f7452be8b5698ecd5f8d9f14a52edb8d4fa5eaf