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

Change-Id: Ib35fc01e2d7627cabd7e99d2c7c3b8689afd2215