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

Change-Id: I7a8a2a88cc88173057a581ec6435d00e820e5653