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

Change-Id: Id299bf5edef313de6429fa949f7ee4a29770e189