Merging from ub-launcher3-master @ build 6538369 am: 741fbf67bc am: 57b7c97f1e

Change-Id: Ifdcf5a1c07b046785a3d9411e49e2ac2700e5d9c