Merge release/21.5 into trunk

[wpmobilebot]

Merging release/21.5 into trunk.

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

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

	App Name	WooCommerce iOS
	Build Number	pr14978-d45eebc
	Version	21.5
	Bundle ID	com.automattic.alpha.woocommerce
	Commit	d45eebc
	App Center Build	WooCommerce - Prototype Builds #12695

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