Merge "Merging from ub-launcher3-master @ build 6327709" into rvc-dev am: ace493908c am: 8729067823 am: 98f2612a59 am: a116ccd671 am: 888ee1b42a

Change-Id: Ideb34caa7af4931b9fb2d35d9a797e035596acc2