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

Change-Id: I1f1b1709de66adc05234095e0077b7adc8105d19