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

Change-Id: Ic80ef2db6aa06c75230a7ec59c595edc428d3fe5