Merging from ub-launcher3-master @ build 6294827 am: 8674a882f6 am: 6b9d3c4a06 am: 64ab29be4f am: 0ff2e03b3d am: c5bf730573

Change-Id: Ieebda26fc5c36248aa7d77a1262dc110fee06af4