Merging from ub-launcher3-master @ build 6356169 am: 3ca049371b am: d1f865b138

Change-Id: Ib049836e8172ce4be969b0594739d2c6baf71b22