Merging from ub-launcher3-master @ build 6356169 am: df83c9026d am: 789deeff56 am: 326cb5e7f9 am: 3c1b9afc9c

Change-Id: I798d4879d33fe08db113db39bba8d0984ab6d500