sdixon194 and matticbot Backport Jetpack 12.5-beta Changes (#32606)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/5931365022

8f79e3d