diff --git a/flutter-candidate.txt b/flutter-candidate.txt
index d7dca3875b0..35b67c27ae0 100644
--- a/flutter-candidate.txt
+++ b/flutter-candidate.txt
@@ -1 +1 @@
-2a82af4d2fb83a3f728c3f6e434778c4edf38290
+a0711824a5bac6a4bb9703b5e11601004db3d14b
diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_inputs.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_inputs.dart
index d9b6b2aec09..037d46088bb 100644
--- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_inputs.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_inputs.dart
@@ -121,7 +121,7 @@ class _DropdownInputState<T> extends State<_DropdownInput<T>>
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     return DropdownButtonFormField(
-      value: widget.property.valueDisplay,
+      initialValue: widget.property.valueDisplay,
       autovalidateMode: AutovalidateMode.onUserInteraction,
       validator: (text) => inputValidator(text, property: widget.property),
       decoration: decoration(
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png
index 108c238a7fe..f7c02b175de 100644
Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png and b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png differ
diff --git a/packages/devtools_app/test/test_infra/goldens/logging/metadata_chips.png b/packages/devtools_app/test/test_infra/goldens/logging/metadata_chips.png
index c56998cc531..296b24c0370 100644
Binary files a/packages/devtools_app/test/test_infra/goldens/logging/metadata_chips.png and b/packages/devtools_app/test/test_infra/goldens/logging/metadata_chips.png differ
diff --git a/tool/build_release.sh b/tool/build_release.sh
index 0720b168023..951fbf56dc8 100755
--- a/tool/build_release.sh
+++ b/tool/build_release.sh
@@ -81,7 +81,8 @@ flutter build web \
   --wasm \
   --pwa-strategy=offline-first \
   --release \
-  --no-tree-shake-icons
+  --no-tree-shake-icons \
+  --no-minify-wasm
 
 # Ensure permissions are set correctly on canvaskit binaries.
 chmod 0755 build/web/canvaskit/canvaskit.*
diff --git a/tool/lib/commands/build.dart b/tool/lib/commands/build.dart
index 63abe12dcfe..3f7078088c5 100644
--- a/tool/lib/commands/build.dart
+++ b/tool/lib/commands/build.dart
@@ -45,7 +45,8 @@ class BuildCommand extends Command {
       ..addPubGetFlag()
       ..addBulidModeOption()
       ..addWasmFlag()
-      ..addNoStripWasmFlag();
+      ..addNoStripWasmFlag()
+      ..addNoMinifyWasmFlag();
   }
 
   @override
@@ -67,6 +68,8 @@ class BuildCommand extends Command {
     final buildMode = results[SharedCommandArgs.buildMode.flagName] as String;
     final useWasm = results[SharedCommandArgs.wasm.flagName] as bool;
     final noStripWasm = results[SharedCommandArgs.noStripWasm.flagName] as bool;
+    final noMinifyWasm =
+        results[SharedCommandArgs.noMinifyWasm.flagName] as bool;
 
     final webBuildDir = Directory(
       path.join(repo.devtoolsAppDirectoryPath, 'build', 'web'),
@@ -105,6 +108,7 @@ class BuildCommand extends Command {
           if (useWasm) ...[
             SharedCommandArgs.wasm.asArg(),
             if (noStripWasm) SharedCommandArgs.noStripWasm.asArg(),
+            if (noMinifyWasm) SharedCommandArgs.noMinifyWasm.asArg(),
           ] else ...[
             // Do not minify stack traces in debug mode.
             if (buildMode == 'debug') '--dart2js-optimization=O1',
diff --git a/tool/lib/commands/serve.dart b/tool/lib/commands/serve.dart
index 9c5dad19b2d..e4b2decf9d4 100644
--- a/tool/lib/commands/serve.dart
+++ b/tool/lib/commands/serve.dart
@@ -92,6 +92,7 @@ class ServeCommand extends Command {
       ..addBulidModeOption()
       ..addWasmFlag()
       ..addNoStripWasmFlag()
+      ..addNoMinifyWasmFlag()
       // Flags defined in the server in DDS.
       ..addFlag(
         _machineFlag,
@@ -147,6 +148,7 @@ class ServeCommand extends Command {
         results[SharedCommandArgs.updatePerfetto.flagName] as bool;
     final useWasm = results[SharedCommandArgs.wasm.flagName] as bool;
     final noStripWasm = results[SharedCommandArgs.noStripWasm.flagName] as bool;
+    final noMinifyWasm = results[SharedCommandArgs.noMinifyWasm.flagName] as bool;
     final runPubGet = results[SharedCommandArgs.pubGet.flagName] as bool;
     final devToolsAppBuildMode =
         results[SharedCommandArgs.buildMode.flagName] as String;
@@ -172,6 +174,7 @@ class ServeCommand extends Command {
           ..remove(SharedCommandArgs.updatePerfetto.asArg())
           ..remove(SharedCommandArgs.wasm.asArg())
           ..remove(SharedCommandArgs.noStripWasm.asArg())
+          ..remove(SharedCommandArgs.noMinifyWasm.asArg())
           ..remove(valueAsArg(_buildAppFlag))
           ..remove(valueAsArg(_buildAppFlag, negated: true))
           ..remove(SharedCommandArgs.runApp.asArg())
@@ -221,6 +224,7 @@ class ServeCommand extends Command {
           if (updatePerfetto) SharedCommandArgs.updatePerfetto.asArg(),
           if (useWasm) SharedCommandArgs.wasm.asArg(),
           if (noStripWasm) SharedCommandArgs.noStripWasm.asArg(),
+          if (noMinifyWasm) SharedCommandArgs.noMinifyWasm.asArg(),
           '${SharedCommandArgs.buildMode.asArg()}=$devToolsAppBuildMode',
           SharedCommandArgs.pubGet.asArg(negated: !runPubGet),
         ]),
diff --git a/tool/lib/commands/shared.dart b/tool/lib/commands/shared.dart
index d2e1d382cd0..b353d1caa33 100644
--- a/tool/lib/commands/shared.dart
+++ b/tool/lib/commands/shared.dart
@@ -84,6 +84,17 @@ extension BuildCommandArgsExtension on ArgParser {
     );
   }
 
+  void addNoMinifyWasmFlag() {
+    addFlag(
+      SharedCommandArgs.noMinifyWasm.flagName,
+      defaultsTo: false,
+      help:
+          'When this flag is present, class names and errors will not be '
+          'truncated. This flag is ignored if the --wasm flag is '
+          'not present.',
+    );
+  }
+
   void addDebugServerFlag() {
     addFlag(
       SharedCommandArgs.debugServer.flagName,
@@ -109,6 +120,7 @@ enum SharedCommandArgs {
   pubGet('pub-get'),
   wasm('wasm'),
   noStripWasm('no-strip-wasm'),
+  noMinifyWasm('no-minify-wasm'),
   runApp('run-app'),
   serveWithDartSdk('serve-with-dart-sdk'),
   updateFlutter('update-flutter'),