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

Change-Id: Id32e02b32248a387591ed3c6744368f247559983