Merge "Merging from ub-launcher3-master @ build 6304996" into rvc-dev am: c83758f223 am: 69ebef4c4a

Change-Id: Ib91e56606c55b91b1cb19cb12b8af622501a9bf7