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

Change-Id: If9387115ca7bd9844963ee9a623e92a847b1c4ff