Merge "Fixing BindWidgetTest failing on Launcher3" into ub-launcher3-master