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

Change-Id: I736211bb75a028c88f31d5f26486264b5c6a0a9a