Merge latest changes from WordPress-Android

[shiki]

This contains the changes from:

• https://github.com/wordpress-mobile/WordPress-Android/pull/10255 by @shiki
• https://github.com/wordpress-mobile/WordPress-Android/pull/10142 by @maxme

Testing

I'm not quite sure how testing should be done for this type of PR. I have created draft pull requests using this branch:

• WC https://github.com/woocommerce/woocommerce-android/pull/1277
• WP https://github.com/wordpress-mobile/WordPress-Android/pull/10270

I have tested both WC and WP and did not see any issues.

Reviewing

Only 1 reviewer is needed but anyone can review.

Tasks

• [x] Merge this if it gets approved.
• [ ] Set the corresponding WC and WP draft pull requests as Ready for review.