Merging from ub-launcher3-master @ build 6269120 am: 8f03c5c1ce

Change-Id: I68732dedc52fd998d31dc2aa99d924e5fcba2365