Merge "Enable nested scrolling for locale picker" into sc-v2-dev