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

Change-Id: I7782095e4062d187f37552a72217846b598e8266