Merge release/25.4 into trunk

[wpmobilebot]

Merging release/25.4 into trunk.

Via intermediate branch merge/release-25.4-into-trunk, to help fix conflicts if any:

                            release/25.4  ----o-- - - -
                                               \
           merge/release-25.4-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

[dangermattic]

	1 Message
📖	This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

[wpmobilebot]

📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.

	App Name	WordPress Alpha
	Configuration	Release-Alpha
	Build Number	pr23632-f197201
	Version	25.4
	Bundle ID	org.wordpress.alpha
	Commit	f197201
	App Center Build	WPiOS - One-Offs #10754

Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

[wpmobilebot]

📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.

	App Name	Jetpack Alpha
	Configuration	Release-Alpha
	Build Number	pr23632-f197201
	Version	25.4
	Bundle ID	com.jetpack.alpha
	Commit	f197201
	App Center Build	jetpack-installable-builds #9797

Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

[mokagio]

Closing in order to open a backmerge for the new beta.

A new beta was necessary because of a couple of ASC upload issues that, along the way, required a build number bump and this PR could not be merged automatically in the meantime because of the CI failure (#23635 addresses it and I'll cherry pick it in the backmerge)

[mokagio]

See #23636