Merge "Bug fixes for widget picker search." into sc-dev