[RNMobile] Merge mobile release v1.20.0 back into master (step 2) #19568
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This is step 2 in our merge process of gutenberg-mobile v1.20.0 into master. The first one is accepted #19562. This one should be fixing conflicts with master.
Related PR in gutenberg-mobile: wordpress-mobile/gutenberg-mobile#1752
Details:
How has this been tested?
This should be tested in this gutenberg-mobile PR: wordpress-mobile/gutenberg-mobile#1752 and in the WP apps directly (WPAndroid - wordpress-mobile/WordPress-Android#11052, WPiOS - wordpress-mobile/WordPress-iOS#13190).
Checklist: