Merge "Bug fixes for widget picker search (2/n)" into sc-dev