Merge pull request #7283 from Techjar/netplay-improve-settings-sync NetPlay: Improve settings synchronization and UI
