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

Change-Id: I2dcf702b28be5ab6f001aa0b3adde824ae7d765a