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

Change-Id: I63bda6079089b3a61b76be5e61dd08a1db5fac90