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

Change-Id: Iab05258116cde8183bf0341edf6697ab67e71993