Merge "Fix few A11y/ UI bugs for widget pickers" into sc-dev