Merge "Improvements to widget picker search." into sc-dev