Merge release/22.4 into trunk

[wpmobilebot]

Merging release/22.4 into trunk.

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

                            release/22.4  ----o-- - - -
                                               \
           merge/release-22.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 WooCommerce iOS Prototype by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce iOS Prototype
	Build Number	30029
	Version	PR #15666
	Bundle ID	com.automattic.alpha.woocommerce
	Commit	b81f168
	Installation URL	7aaoouavc2gfg

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