diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md
index a7050dde8ef..1d8587f61c9 100644
--- a/packages/image_picker/image_picker_android/CHANGELOG.md
+++ b/packages/image_picker/image_picker_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.12+21
+
+* Ensures that platform messages on background queues are handled in order.
+
 ## 0.8.12+20
 
 * Updates androidx.annotation:annotation to 1.9.1.
diff --git a/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/Messages.java b/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/Messages.java
index 5c72a30b591..f0a05767dde 100644
--- a/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/Messages.java
+++ b/packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/Messages.java
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.6.2), do not edit directly.
+// Autogenerated from Pigeon (v24.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package io.flutter.plugins.imagepicker;
@@ -923,8 +923,8 @@ static void setUp(
         @NonNull String messageChannelSuffix,
         @Nullable ImagePickerApi api) {
       messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix;
+      BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
@@ -960,7 +960,6 @@ public void error(Throwable error) {
         }
       }
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
@@ -1030,7 +1029,6 @@ public void error(Throwable error) {
         }
       }
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
diff --git a/packages/image_picker/image_picker_android/lib/src/messages.g.dart b/packages/image_picker/image_picker_android/lib/src/messages.g.dart
index cbeb6a2e61a..c11b059ee30 100644
--- a/packages/image_picker/image_picker_android/lib/src/messages.g.dart
+++ b/packages/image_picker/image_picker_android/lib/src/messages.g.dart
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.6.2), do not edit directly.
+// Autogenerated from Pigeon (v24.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
 
diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml
index 14735e3b7df..d3eedeec6ab 100755
--- a/packages/image_picker/image_picker_android/pubspec.yaml
+++ b/packages/image_picker/image_picker_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker_android
 description: Android implementation of the image_picker plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.12+20
+version: 0.8.12+21
 
 environment:
   sdk: ^3.5.0
@@ -27,7 +27,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mockito: ^5.4.4
-  pigeon: ^22.4.1
+  pigeon: ^24.2.0
 
 topics:
   - camera
diff --git a/packages/image_picker/image_picker_android/test/test_api.g.dart b/packages/image_picker/image_picker_android/test/test_api.g.dart
index f28bafe9ea7..5badb7e147f 100644
--- a/packages/image_picker/image_picker_android/test/test_api.g.dart
+++ b/packages/image_picker/image_picker_android/test/test_api.g.dart
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.6.2), do not edit directly.
+// Autogenerated from Pigeon (v24.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import, no_leading_underscores_for_local_identifiers
 // ignore_for_file: avoid_relative_lib_imports
diff --git a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
index 2f5861b11d4..0da48fd377d 100644
--- a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
+++ b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.4.6
+
+* Ensures that platform messages on background queues are handled in order.
+
 ## 2.4.5
 
 * Bumps gradle-plugin to 2.1.10.
diff --git a/packages/shared_preferences/shared_preferences_android/android/src/main/java/io/flutter/plugins/sharedpreferences/Messages.java b/packages/shared_preferences/shared_preferences_android/android/src/main/java/io/flutter/plugins/sharedpreferences/Messages.java
index 8ea865ca5e0..90140c80579 100644
--- a/packages/shared_preferences/shared_preferences_android/android/src/main/java/io/flutter/plugins/sharedpreferences/Messages.java
+++ b/packages/shared_preferences/shared_preferences_android/android/src/main/java/io/flutter/plugins/sharedpreferences/Messages.java
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.7.2), do not edit directly.
+// Autogenerated from Pigeon (v24.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package io.flutter.plugins.sharedpreferences;
@@ -129,8 +129,8 @@ static void setUp(
         @NonNull String messageChannelSuffix,
         @Nullable SharedPreferencesApi api) {
       messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix;
+      BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
@@ -157,7 +157,6 @@ static void setUp(
         }
       }
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
@@ -185,7 +184,6 @@ static void setUp(
         }
       }
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
@@ -213,7 +211,6 @@ static void setUp(
         }
       }
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
@@ -241,7 +238,6 @@ static void setUp(
         }
       }
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
@@ -269,7 +265,6 @@ static void setUp(
         }
       }
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
@@ -297,7 +292,6 @@ static void setUp(
         }
       }
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
@@ -325,7 +319,6 @@ static void setUp(
         }
       }
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
@@ -353,7 +346,6 @@ static void setUp(
         }
       }
       {
-        BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
                 binaryMessenger,
diff --git a/packages/shared_preferences/shared_preferences_android/android/src/main/kotlin/io/flutter/plugins/sharedpreferences/MessagesAsync.g.kt b/packages/shared_preferences/shared_preferences_android/android/src/main/kotlin/io/flutter/plugins/sharedpreferences/MessagesAsync.g.kt
index 39a19ed6843..bf0659ba0b7 100644
--- a/packages/shared_preferences/shared_preferences_android/android/src/main/kotlin/io/flutter/plugins/sharedpreferences/MessagesAsync.g.kt
+++ b/packages/shared_preferences/shared_preferences_android/android/src/main/kotlin/io/flutter/plugins/sharedpreferences/MessagesAsync.g.kt
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.7.4), do not edit directly.
+// Autogenerated from Pigeon (v24.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
 
@@ -196,8 +196,8 @@ interface SharedPreferencesAsyncApi {
     ) {
       val separatedMessageChannelSuffix =
           if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+      val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -224,7 +224,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -251,7 +250,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -278,7 +276,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -305,7 +302,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -332,7 +328,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -359,7 +354,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -384,7 +378,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -409,7 +402,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -434,7 +426,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -459,7 +450,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -484,7 +474,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -509,7 +498,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -535,7 +523,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
@@ -560,7 +547,6 @@ interface SharedPreferencesAsyncApi {
         }
       }
       run {
-        val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
         val channel =
             BasicMessageChannel<Any?>(
                 binaryMessenger,
diff --git a/packages/shared_preferences/shared_preferences_android/lib/src/messages.g.dart b/packages/shared_preferences/shared_preferences_android/lib/src/messages.g.dart
index b94a30e61fb..97f35363396 100644
--- a/packages/shared_preferences/shared_preferences_android/lib/src/messages.g.dart
+++ b/packages/shared_preferences/shared_preferences_android/lib/src/messages.g.dart
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.7.2), do not edit directly.
+// Autogenerated from Pigeon (v24.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
 
diff --git a/packages/shared_preferences/shared_preferences_android/lib/src/messages_async.g.dart b/packages/shared_preferences/shared_preferences_android/lib/src/messages_async.g.dart
index 74cc0f3fd4a..58e9417ffff 100644
--- a/packages/shared_preferences/shared_preferences_android/lib/src/messages_async.g.dart
+++ b/packages/shared_preferences/shared_preferences_android/lib/src/messages_async.g.dart
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.7.4), do not edit directly.
+// Autogenerated from Pigeon (v24.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
 
diff --git a/packages/shared_preferences/shared_preferences_android/pubspec.yaml b/packages/shared_preferences/shared_preferences_android/pubspec.yaml
index 5214cea1f7e..691c85f12d3 100644
--- a/packages/shared_preferences/shared_preferences_android/pubspec.yaml
+++ b/packages/shared_preferences/shared_preferences_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: shared_preferences_android
 description: Android implementation of the shared_preferences plugin
 repository: https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22
-version: 2.4.5
+version: 2.4.6
 
 environment:
   sdk: ^3.5.0
@@ -25,7 +25,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  pigeon: ^22.7.2
+  pigeon: ^24.2.0
 
 topics:
   - persistence