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

Change-Id: If6c3e353b4c73379aad02f84a65e68db75a1521b