Merging from ub-launcher3-master @ build 6269120 am: 39eaaeb892 am: bc67ea7643 am: c68f2b86a1

Change-Id: Ic947db6f6788c205d79748e6298e8ba23eb52f2d