Merge "Fix scrolling issue in the full widgets picker" into sc-dev