Merging from ub-launcher3-master @ build 6304996 am: 58be046dff am: 789b0444af am: 1ad86cfbeb

Change-Id: I8436a360d619f557ae137df6906940eb50b0bfd8