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

Change-Id: I25eb30266d4d0d6158087148e4fb5689e7baf6f7