Update to spice2x-25-04-25 (pre-apply)

> broken commit

launcher/shutdown.cpp

@@ -6,24 +6,24 @@
 #include "api/controller.h"
 #include "easrv/easrv.h"
 #include "rawinput/rawinput.h"
-#include "misc/vrutil.h"
 #include "hooks/audio/audio.h"
 #include "util/logging.h"
 
 #include "launcher.h"
 #include "logger.h"
+#include "nvapi/nvapi.h"
 
 namespace launcher {
 
     void stop_subsystems() {
+        // note that it is possible for stop_subsystems to be called multiple times
+        // (e.g., crashing, and then closing the window)
+        // therefore, subsystems need to be guarded against multiple unload attempts
         log_info("launcher", "stopping subsystems");
 
         // flush/stop logger
         logger::stop();
 
-        // VR
-        vrutil::shutdown();
-
         // stop ea server
         easrv_shutdown();
 
@@ -39,6 +39,9 @@ namespace launcher {
         if (RI_MGR) {
             RI_MGR->stop();
         }
+
+        // unload nvapi and free library (if loaded)
+        nvapi::unload();
     }
 
     void kill(UINT exit_code) {