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

Change-Id: I4e18074e1142561e06798902bf8f156ee6aa4d40