Merge "Fix nested scrolling in two pane picker left pane" into main