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

Change-Id: I89a6649cd9e6696ee39f03a8361de8c436fe8edc