Merging from ub-launcher3-master @ build 6248758 am: 3210c06687 am: 9df3490fee am: d3020e1080 am: c1b4a2b823

Change-Id: I57274cd5f6f99ce4c4cbefdc28ed8fc3c7aaa549