Merging from ub-launcher3-master @ build 6538369 am: 741fbf67bc

Change-Id: I7b9e593329dac26ad51af448e96d6f8ed9d04761