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

Change-Id: I3fcd81dfddab2b69a6cd6ee09572411b9adaf184