Merging from ub-launcher3-master @ build 6476761 am: b2c43c5cb1

Change-Id: I6d5700e234f1cf8df56e420701722d34e0a9ac14