Merging from ub-launcher3-master @ build 6269120 am: 8f03c5c1ce am: 8df766f1ba am: 8538f1eff4 am: 255284108e

Change-Id: I7fb2b04d60f4064a3152322c6bf2a5e4728eb923