Merge "Replace horizontal ScrollViews with tables in the full widgets picker" into sc-dev