Merging from ub-launcher3-master @ build 6269120 am: 8f03c5c1ce

Change-Id: Iac362976aead4c1a386ddc637ec410e4c87d6b99