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

Change-Id: I8e4c5cac8216c4b98c778b155c5b0cb2bce7bf6c