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

Change-Id: I1a5ecb42c56ae5cce1a7081598a1a626d1f21953