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

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	f08eb4a
	Direct Download	woocommerce-wear-prototype-build-pr13430-f08eb4a.apk

[wpmobilebot]

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	f08eb4a
	Direct Download	woocommerce-prototype-build-pr13430-f08eb4a.apk