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

Change-Id: Ie2795dfdca802943dddf8fb08bbc2b35a4dd40dd