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

Change-Id: I29cba9be2ecff157645d92fbaf33f4f3515463f8