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

Change-Id: I98819cc2b99d43a46e8e12e61c3f6364bb0fc708