Merging from ub-launcher3-master @ build 6369897 am: 884f8f217f am: d3ba747e6d am: 2e85538b77 am: 38f50910f6

Change-Id: I29d9f7905726120f4d3b5f0a5af60213d12e5176