Merged from jingwen_main for image icon revision

tests/layout-backend-static.test.js

@@ -61,6 +61,7 @@ assert(
   'save-layout response should include an svg_url for the new layout tab'
 );
 assert(
+<<<<<<< HEAD
   serverPy.includes('svg_ready') &&
     serverPy.includes('svg_version') &&
     serverPy.includes('file_version(svg_path)') &&
@@ -73,6 +74,8 @@ assert(
   'save-layout should publish generated SVG previews atomically instead of serving partially written files'
 );
 assert(
+=======
+>>>>>>> jingwen_main
   serverPy.includes('RouterStackUnavailable') &&
     serverPy.includes('except RouterStackUnavailable as e') &&
     serverPy.includes('"preview_status": preview_status') &&