Merge "[Settings] Remove the legacy 2-pane registration"