Merge pull request #7471 from JosJuice/country-region-switch DiscIO: Improve RegionSwitch/CountrySwitch
