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

Change-Id: I72ea5a6bbd752299af7e7d68a9c6fbcbb4af83f9