Merge "Add ACONFIG flag enable_unfolded_two_pane_picker" into main