Merge trunk in SPM PR

[kean]

To test:

Regression Notes

1. Potential unintended areas of impact

2. What I did to test those areas of impact (or what existing automated tests I relied on)

3. What automated tests I added (or what prevented me from doing so)

PR submission checklist:

• [ ] I have completed the Regression Notes.
• [ ] I have considered adding unit tests for my changes.
• [ ] I have considered adding accessibility improvements for my changes.
• [ ] I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

Testing checklist:

• [ ] WordPress.com sites and self-hosted Jetpack sites.
• [ ] Portrait and landscape orientations.
• [ ] Light and dark modes.
• [ ] Fonts: Larger, smaller and bold text.
• [ ] High contrast.
• [ ] VoiceOver.
• [ ] Languages with large words or with letters/accents not frequently used in English.
• [ ] Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
• [ ] iPhone and iPad.
• [ ] Multi-tasking: Split view and Slide over. (iPad)

[dangermattic]

	1 Error
:no_entry_sign:	PR requires at least one label.

	3 Warnings
:warning:	Translation files *.lproj/Localizable.strings should only be updated on a release branch.
:warning:	View files have been modified, but no screenshot or video is included in the pull request. Consider adding some for clarity.
:warning:	This PR is larger than 500 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

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	pr23393-1cf0af0
	Version	25.1
	Bundle ID	org.wordpress.alpha
	Commit	1cf0af0df94f8c0c89323c1df38f098775a8b51c
	App Center Build	WPiOS - One-Offs #10258

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	pr23393-1cf0af0
	Version	25.1
	Bundle ID	com.jetpack.alpha
	Commit	1cf0af0df94f8c0c89323c1df38f098775a8b51c
	App Center Build	jetpack-installable-builds #9305

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