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
:book:	This PR has the Releases label: some checks will be skipped.

Generated by :no_entry_sign: 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	pr23636-1818a36
	Version	25.4
	Bundle ID	org.wordpress.alpha
	Commit	1818a368c31234d375b91b9c57a5f2d814d92d62
	App Center Build	WPiOS - One-Offs #10760

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	pr23636-1818a36
	Version	25.4
	Bundle ID	com.jetpack.alpha
	Commit	1818a368c31234d375b91b9c57a5f2d814d92d62
	App Center Build	jetpack-installable-builds #9803

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