Merge "Add ACONFIG flag enable_tablet_two_pane_picker_v2" into main