Merging from ub-launcher3-master @ build 6248758 am: 3210c06687 am: 20aaa198f3

Change-Id: I870813d3d408bb50a3f2d798cd310016950d57ef