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

Change-Id: I403aaf7d70169aa2e6be07c43147baed28b2e8b5