Merging from ub-launcher3-master @ build 6408463 am: 8a3847e752 am: d74c5f8a7e

Change-Id: Idadfb067b60a77cd850ead525f8f3b4bbc7773c8