Merge branch 'master' into master

UI/NativeApp.cpp

@@ -103,6 +103,7 @@
 #include "Core/HLE/proAdhoc.h"
 #include "Core/HW/MemoryStick.h"
 #include "Core/Util/GameManager.h"
+#include "Core/Util/PortManager.h"
 #include "Core/Util/AudioFormat.h"
 #include "Core/WebServer.h"
 #include "Core/TiltEventProcessor.h"
@@ -1431,6 +1432,8 @@ void NativeShutdown() {
 	System_ExitApp();
 #endif
 
+	g_PortManager.Shutdown();
+
 	net::Shutdown();
 
 	g_Discord.Shutdown();