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

Change-Id: Id629bef6a92adef4bff2a6022b7b269cb97794eb