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

Change-Id: I1d7f9d65daedbad0c2e702a7805a85855a0e2e0f