Merge "Merging from ub-launcher3-master @ build 6304996" into rvc-dev am: c83758f223

Change-Id: I5a6d4f5198e8aace4ad3a6c27b8d5be5893f7755