Merging from ub-launcher3-master @ build 6294827 am: 8674a882f6 am: c93476608e

Change-Id: I7f43e3dfd67412f22adb81871ad236b476355897