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

Change-Id: Ie6f535f912f6aa705d9a460fb531d0ab1d4504c6