Merge "Merging from ub-launcher3-master @ build 6327709" into rvc-dev am: ace493908c am: 8729067823 am: 303ff51c2b

Change-Id: Iabbc1d40f73ab7478a47a52d46a006e10ae3313c