Merging from ub-launcher3-master @ build 6294827 am: 95dcde1855

Change-Id: I532e2c51fcba7f8e7a9df9ff3a12e3436301a3f3