Merge "Fix bugs for Widgets picker Search UI." into sc-dev