diff --git a/demo/golden/baselines/baselines-index.json b/demo/golden/baselines/baselines-index.json
index b8d3a5be..34346c77 100644
--- a/demo/golden/baselines/baselines-index.json
+++ b/demo/golden/baselines/baselines-index.json
@@ -1,8 +1,8 @@
 {
   "schema": 1,
-  "matrixVersion": 39,
-  "acceptedAt": "2026-08-23T06:49:21.230Z",
-  "sourceFingerprint": "f3ed53aabec5afb371295d3a681d1cfc11ff6c704cffd8325874c337983b8572",
+  "matrixVersion": 40,
+  "acceptedAt": "2026-08-23T15:57:19.621Z",
+  "sourceFingerprint": "b9a6dbc468131fd3b2e2056fd2b205e3a51ad875c1b462edda33fff11310f3fa",
   "chromium": "151.0.7922.34",
   "scenarios": {
     "split-corner-wall-before-dark": "3176dc67f54d5309f87c94e1077b4f69eb1db9f660469fbf97953038323430f3",
@@ -14,7 +14,7 @@
     "isometric-live-layers-dark": "90fa1c0b64a12626e481c5f34e515c53b3e06cd657f5976bb8a72127aec3e1e9",
     "isometric-no-borders-dark": "a0abf9fdc31092980de3bcbf8598844b6e3d152363694e9bd070d45af73c26d9",
     "isometric-touch-kiosk-dark": "d3ae363165c4f0aba65bcbac9bd6bdca79f29aca03bba997f3abec1860eb1e55",
-    "isometric-large-warm-remount-dark": "b53aec1bdb466be97a21250db914b88535449321967ecc80c4bbe749a2af82b5",
+    "isometric-large-warm-remount-dark": "cf0a7bcc90aaaeb41a70f32ae737ee517e7099add72db03b7938a4a8049886d5",
     "geometry-view-dark-fit": "e680793d24a575727d5b87910e824f9ba1fbdb9d7a0c6f60b8bfe839afe73a98",
     "geometry-view-light-fit": "8a2fa3c2c7f28cb55fb3119b645fa68b92dbda71706642e38dba569a7f770eea",
     "room-label-parity-view-dark": "b35675251b85144bca1bc15ed7bf27a4dd1eaa0bfc288e3e3b0d1cdefac79ae5",
@@ -38,6 +38,7 @@
     "junction-patch-resilience-plan-dark": "ac3e1818d3e85e8fd4e2a24695deb4461ee8b7f49a87c29528c95a352ef93a8d",
     "junction-patch-resilience-view-dark": "b91397ccbb9e7d94622f15303c486146b0903c000f517e36efb7abcfa28a7a0a",
     "multiwall-junction-bevel-view-dark": "ae486afba2a275d95d9a64b13210cc3b43cf01633ba2df2e2898f943e3d44869",
+    "wall-key-roundtrip-view-dark": "28895aa02eb995f976b26a2d2b3675954611641b60910f40427b15a95ef53e3e",
     "isometric-wall-junctions-dark": "d1956cbbde9a6a02953ce80eb8a0f74ca06ea268a4c60bb09b5b3981c26d9731",
     "opening-placement-door-thick-wall-dark": "6bb2211e9640800d5b3e1ad413297c7aa93a60bc13bb481b26f09a6abe122838",
     "opening-placement-passage-thick-wall-dark": "d5befd61224ef98cbe340938e6db321faad354ec167cf3244923bbdafdfbfe17",
@@ -80,9 +81,9 @@
     "lighting-manual-auto-spill-overlap-dark": "0dc780335317d6dd577c8d5539f33223228074e1c95e936e4666f50a8db09739",
     "hover-over-glow-dark": "49136f6073662482ebf49a28f8f22b698d2c20a9cb64b5667d111b9835717968",
     "hover-nested-room-dark": "6ed270f62e7c1cb5e28e800cae46b4839987467bf6b2933c1af212f9b716f2fe",
-    "large-house-zoom-040-dark": "71847674ec42b0dac55208e9571635bee50fb20485d4e31f797df3cef5b42b37",
-    "large-house-zoom-250-dark": "7acd4cc3b3dfa2124f7c6839e78c9539dcb224af47a321049095cd7ff9e3de68",
-    "large-house-warm-remount-dark": "2532c6e438b219a2bebeab3658b184c3b6d2f5401fd485a660d96f95d32f382a",
+    "large-house-zoom-040-dark": "4f52ad1b5b3bff3149429322d23517ef590d8d1c5ea431538a51359955a6d150",
+    "large-house-zoom-250-dark": "cc6776eaa14513e83828107fb2ec2fc8f14ad48ed40b1af4fa3d6e92660d7334",
+    "large-house-warm-remount-dark": "f96230f5a4505da2173d109d4bb7e35f488774daf90f2531d49df322c8c589a3",
     "device-dialog-desktop-en": "a6637997458ef1def3d30ffaccb6bbc9728dbc4ba2f02400a7334915a8101bbe",
     "device-dialog-mobile-ru": "c90be98e65c37963fd4443e413848ca68a412c9ee568d648aba76bf9232ee59d",
     "toggle-entity-dialog-desktop-en": "f4924466de5e134c2d1f2456ff0c05f8aa8106f6b06398e87a263e3c536f16ea",
diff --git a/demo/golden/baselines/isometric-large-warm-remount-dark.png b/demo/golden/baselines/isometric-large-warm-remount-dark.png
index f3e4bd8c..d38a87cd 100644
Binary files a/demo/golden/baselines/isometric-large-warm-remount-dark.png and b/demo/golden/baselines/isometric-large-warm-remount-dark.png differ
diff --git a/demo/golden/baselines/large-house-warm-remount-dark.png b/demo/golden/baselines/large-house-warm-remount-dark.png
index a6fa56b5..34578bf6 100644
Binary files a/demo/golden/baselines/large-house-warm-remount-dark.png and b/demo/golden/baselines/large-house-warm-remount-dark.png differ
diff --git a/demo/golden/baselines/large-house-zoom-040-dark.png b/demo/golden/baselines/large-house-zoom-040-dark.png
index 05a8a988..1e08e364 100644
Binary files a/demo/golden/baselines/large-house-zoom-040-dark.png and b/demo/golden/baselines/large-house-zoom-040-dark.png differ
diff --git a/demo/golden/baselines/large-house-zoom-250-dark.png b/demo/golden/baselines/large-house-zoom-250-dark.png
index d905ac44..abe2dd87 100644
Binary files a/demo/golden/baselines/large-house-zoom-250-dark.png and b/demo/golden/baselines/large-house-zoom-250-dark.png differ
diff --git a/demo/golden/baselines/wall-key-roundtrip-view-dark.png b/demo/golden/baselines/wall-key-roundtrip-view-dark.png
new file mode 100644
index 00000000..7ab9a8df
Binary files /dev/null and b/demo/golden/baselines/wall-key-roundtrip-view-dark.png differ