Merge "Fix some bugs in widget pickers." into sc-dev