Merge release/21.1 into trunk

[wpmobilebot]

Merging release/21.1 into trunk.

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

                            release/21.1  ----o-- - - -
                                               \
           merge/release-21.1-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

[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	798e240ce48d7ad2306de4510b7b3cf333fd403e
	Direct Download	woocommerce-wear-prototype-build-pr12929-798e240.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	798e240ce48d7ad2306de4510b7b3cf333fd403e
	Direct Download	woocommerce-prototype-build-pr12929-798e240.apk