Merging from ub-launcher3-master @ build 6248758 am: 3210c06687

Change-Id: Iaa41764230c04e85d31a6532ebb16069e17ca547