Merge 18.5 final into trunk

[wpmobilebot]

No description provided.

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

	App Name	WooCommerce Android
	Flavor	Jalapeno
	Build Type	Debug
	Commit	e2c149a
	Direct Download	woocommerce-prototype-build-pr11482-e2c149a.apk

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 40.79%. Comparing base (670045d) to head (e2c149a).
Report is 142 commits behind head on trunk.

Additional details and impacted files

@@            Coverage Diff            @@
##              trunk   #11482   +/-   ##
=========================================
  Coverage     40.79%   40.79%           
  Complexity     5224     5224           
=========================================
  Files          1071     1071           
  Lines         62994    62994           
  Branches       8610     8610           
=========================================
+ Hits          25696    25697    +1     
+ Misses        34985    34984    -1     
  Partials       2313     2313           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.