Merging from ub-launcher3-master @ build 6356169 am: df83c9026d am: 789deeff56

Change-Id: I34fc45b67693ffd48431a7de4140fffd25797664