Restore trunk state as of f85f732f9f6f10f0dcafc4918f94f4353f66c9a6

I accidentally pushed commits to `trunk` which should have been in a PR
while experimenting with an updated code freeze workflow for version
4.52.

This commit was done by comparing against the tip of `trunk` before my
mistake, f85f732

It reverts bfc2fc0 and
a774214, then cherry-picks all those
changes there were somehow reverted in my previous fix attempt, eb52ef6

Gemfile

@@ -8,8 +8,11 @@ gem 'danger-dangermattic', '~> 1.0'
 gem 'fastlane', '~> 2'
 gem 'fastlane-plugin-appcenter', '~> 2.1.2'
 gem 'fastlane-plugin-sentry', '~> 1.6'
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0', '>= 11.0.1'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0.1'
 
 group :screenshots, optional: true do
   gem 'rmagick', '~> 3.2.0'
 end
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.1.3.4)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -15,33 +15,33 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     artifactory (3.0.17)
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.957.0)
-    aws-sdk-core (3.201.2)
+    aws-partitions (1.921.0)
+    aws-sdk-core (3.193.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.156.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.80.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.148.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.7)
     buildkit (1.6.0)
       sawyer (>= 0.6)
     chroma (0.2.0)
@@ -91,7 +91,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -129,7 +129,7 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.111.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -161,7 +161,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.221.1)
+    fastlane (2.220.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -205,7 +205,7 @@ GEM
     fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.22.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (11.0.3)
+    fastlane-plugin-wpmreleasetoolkit (11.0.1)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -266,37 +266,37 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.6)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.5)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.2)
+    jwt (2.8.1)
       base64
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    mini_magick (4.13.2)
+    mini_magick (4.12.0)
     mini_mime (1.1.5)
-    minitest (5.24.1)
+    minitest (5.22.3)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.4.1)
+    multipart-post (2.4.0)
     mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.16.6-arm64-darwin)
+    nokogiri (1.16.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.16.4-x86_64-linux)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
@@ -305,16 +305,16 @@ GEM
     options (2.3.2)
     optparse (0.5.0)
     os (1.1.4)
-    parallel (1.25.1)
+    parallel (1.24.0)
     parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     plist (3.7.1)
-    progress_bar (1.3.4)
-      highline (>= 1.6)
+    progress_bar (1.3.3)
+      highline (>= 1.6, < 3)
       options (~> 2.3.0)
     public_suffix (4.0.7)
-    racc (1.8.0)
+    racc (1.7.3)
     rainbow (3.1.1)
     rake (13.2.1)
     rake-compiler (1.2.7)
@@ -326,8 +326,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.9)
-      strscan
+    rexml (3.2.6)
     rmagick (3.2.0)
     rouge (2.0.7)
     rubocop (1.63.4)
@@ -359,7 +358,6 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -399,8 +397,8 @@ DEPENDENCIES
   fastlane (~> 2)
   fastlane-plugin-appcenter (~> 2.1.2)
   fastlane-plugin-sentry (~> 1.6)
-  fastlane-plugin-wpmreleasetoolkit (~> 11.0, >= 11.0.1)
+  fastlane-plugin-wpmreleasetoolkit (~> 11.0.1)
   rmagick (~> 3.2.0)
 
 BUNDLED WITH
-   2.4.21
+   2.5.4