Merge "Fix the horizontal margins on the left panel in the two pane picker." into main