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

Change-Id: Ic47e02898ddd4cb87ff542b258d4e34a34d993b1