Merge "Scroll to the selected widget picker row after headers are clicked" into sc-dev