Merge 1f7083a023 into 4b6e796a0e

This reverts commit dc7791c245.

ui/src/components/VideoOverlay.tsx

@@ -13,6 +13,7 @@ import { useRTCStore, PostRebootAction } from "@/hooks/stores";
 import LogoBlue from "@/assets/logo-blue.svg";
 import LogoWhite from "@/assets/logo-white.svg";
 import { isOnDevice } from "@/main";
+import { sleep } from "@/utils";
 
 
 interface OverlayContentProps {
@@ -481,8 +482,11 @@ export function RebootingOverlay({ show, postRebootAction }: RebootingOverlayPro
           // - Protocol-relative URLs: resolved with current protocol
           // - Fully qualified URLs: used as-is
           const targetUrl = new URL(postRebootAction.redirectTo, window.location.origin);
+          clearInterval(intervalId); // Stop polling before redirect
 
           window.location.href = targetUrl.href;
+          // Add 1s delay between setting location.href and calling reload() to prevent reload from interrupting the navigation.
+          await sleep(1000);
           window.location.reload();
         }
       } catch (err) {

ui/src/components/WebRTCVideo.tsx

@@ -544,7 +544,7 @@ export default function WebRTCVideo({ hasConnectionIssues }: { hasConnectionIssu
                           style={{ animationDuration: "500ms" }}
                           className="animate-slideUpFade pointer-events-none absolute inset-0 flex items-center justify-center"
                         >
-                          <div className="relative h-full w-full rounded-md">
+                          <div className="relative h-full w-full rounded-md" onClick={requestPointerLock}>
                             <LoadingVideoOverlay show={isVideoLoading} />
                             <HDMIErrorOverlay show={hdmiError} hdmiState={hdmiState} />
                             <NoAutoplayPermissionsOverlay