Merged from jingwen_main for image icon revision

tests/layout-ui-wiring.test.js

@@ -33,6 +33,7 @@ assert(
   'Build Layout should use the backend svg_url response'
 );
 assert(
+<<<<<<< HEAD
   canvasHtml.includes('result.svg_ready && result.svg_url') &&
     canvasHtml.includes('buildLayoutRequestRef') &&
     canvasHtml.includes('buildLayoutBusyRef') &&
@@ -40,6 +41,8 @@ assert(
   'Build Layout should wait for a ready, versioned SVG response and prevent stale duplicate preview updates'
 );
 assert(
+=======
+>>>>>>> jingwen_main
   canvasHtml.includes('result.preview_error') &&
     canvasHtml.includes('Preview skipped: '),
   'Build Layout should log when the backend saves YAML but skips SVG preview because the router stack is unavailable'