Cherry pick #20844 into 22.5.1 hotfix

[mokagio]

Refer to #20844 for details. Notice the diff is the same.

[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	pr20924-dbea181
	Version	22.5.1
	Bundle ID	com.jetpack.alpha
	Commit	dbea181
	App Center Build	jetpack-installable-builds #5086

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 WordPress Alpha by scanning the QR code below to install the corresponding build.

	App Name	WordPress Alpha
	Configuration	Release-Alpha
	Build Number	pr20924-dbea181
	Version	22.5.1
	Bundle ID	org.wordpress.alpha
	Commit	dbea181
	App Center Build	WPiOS - One-Offs #6060

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

[mokagio]

I'm going to admin merge this in the hotfix branch in the interest of moving along with the hotfix release process. The changes had been already reviewed in the cherry-picked PR anyway.