Merge "WidgetPicker - allow user ids to be passed as filter arguments" into main