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

Change-Id: Idceedf05cc466258605cf2640f46e0c8db601455