Merging from ub-launcher3-master @ build 6327709 am: 0997905b95

Change-Id: I742a10d9d0c8592258afcbf96057b68ec4724f76