Merging from ub-launcher3-master @ build 6294827 am: 8674a882f6 am: 6b9d3c4a06

Change-Id: I3fca457d939645db5f5a6bf707100c2abced242d