Merge branch 'trunk' into rnmobile/add/reusable-block-capability

# Conflicts:
#	packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergProps.kt
#	packages/react-native-bridge/ios/GutenbergBridgeDelegate.swift
#	packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainActivity.java

packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergProps.kt

@@ -47,6 +47,7 @@ data class GutenbergProps @JvmOverloads constructor(
         putBoolean(PROP_CAPABILITIES_CAN_ENABLE_UNSUPPORTED_BLOCK_EDITOR, canEnableUnsupportedBlockEditor)
         putBoolean(PROP_CAPABILITIES_AUDIO_BLOCK, enableAudioBlock)
         putBoolean(PROP_CAPABILITIES_REUSABLE_BLOCK, enableReusableBlock)
+        putBoolean(PROP_CAPABILITIES_CAN_VIEW_EDITOR_ONBOARDING, canViewEditorOnboarding)
     }
 
     companion object {
@@ -76,5 +77,6 @@ data class GutenbergProps @JvmOverloads constructor(
         const val PROP_CAPABILITIES_CAN_ENABLE_UNSUPPORTED_BLOCK_EDITOR = "canEnableUnsupportedBlockEditor"
         const val PROP_CAPABILITIES_AUDIO_BLOCK = "audioBlock"
         const val PROP_CAPABILITIES_REUSABLE_BLOCK = "reusableBlock"
+        const val PROP_CAPABILITIES_CAN_VIEW_EDITOR_ONBOARDING = "canViewEditorOnboarding"
     }
 }

packages/react-native-bridge/ios/GutenbergBridgeDelegate.swift

@@ -24,6 +24,7 @@ public enum Capabilities: String {
     case canEnableUnsupportedBlockEditor
     case audioBlock
     case reusableBlock
+    case canViewEditorOnboarding
 }
 
 /// Wrapper for single block data

packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainActivity.java

@@ -33,6 +33,7 @@ protected Bundle getLaunchOptions() {
                 capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_UNSUPPORTED_BLOCK_EDITOR, true);
                 capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_AUDIO_BLOCK, true);
                 capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_REUSABLE_BLOCK, true);
+                capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_CAN_VIEW_EDITOR_ONBOARDING, false);
                 bundle.putBundle(GutenbergProps.PROP_CAPABILITIES, capabilities);
                 return bundle;
             }