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

Change-Id: I6ed296b52f2f723ff052efb8f9a8337945d47304