Merging from ub-launcher3-master @ build 6437481 am: 9e99427ee2

Change-Id: I4bf270e9bd157fb137e04ce7fe9022b9106414a1