diff --git a/.circleci/config.yml b/.circleci/config.yml
index d0bfb9884066..76bda9defac1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,22 +11,80 @@ commands:
       - run:
           name: Setup gradle.properties
           command: cp gradle.properties-example gradle.properties
+  yarn-install:
+    steps:
+      - restore_cache:
+          name: Restore Yarn Cache
+          keys:
+            - yarn-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/yarn.lock" }}
+      - run:
+          name: Yarn Install
+          working_directory: libs/gutenberg-mobile
+          command: yarn install --frozen-lockfile --prefer-offline --network-concurrency 1
+      - save_cache:
+          name: Save Yarn Cache
+          key: yarn-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/yarn.lock" }}
+          paths:
+            - libs/gutenberg-mobile/node_modules
+            - libs/gutenberg-mobile/i18n-cache/data
+  checkout-submodules:
+    steps:
+      - run:
+          name: Checkout submodules
+          command: git submodule update --init --recursive
+  checkout-gutenberg-mobile-submodule-only:
+    steps:
+      - run:
+          name: Checkout gutenberg-mobile submodule (no recursive)
+          command: git submodule update --init
+  yarn-bundle-android:
+    steps:
+      - run:
+          name: Yarn bundle Android
+          working_directory: libs/gutenberg-mobile
+          command: yarn bundle:android
 
 version: 2.1
 jobs:
+  gutenberg-bundle-build:
+    docker:
+      - image: circleci/node:10
+    steps:
+      - git/shallow-checkout
+      - checkout-submodules
+      - yarn-install
+      - yarn-bundle-android
+      - run:
+          name: Rename the JS bundle
+          working_directory: libs/gutenberg-mobile
+          command: mv bundle/android/App.js bundle/android/index.android.bundle
+      - persist_to_workspace:
+          root: libs/gutenberg-mobile/bundle/android
+          paths:
+            - index.android.bundle
   test:
     executor: 
       name: android/default
       api-version: "28"
     steps:
       - git/shallow-checkout
+      - checkout-gutenberg-mobile-submodule-only
       - android/restore-gradle-cache
       - copy-gradle-properties
+      - run:
+          name: Ensure assets folder exists
+          command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
+      - attach_workspace:
+          at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
       - run:
           name: Test WordPress
-          command: ./gradlew --stacktrace testVanillaRelease
+          environment:
+            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
+          command: SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD=1 ./gradlew testVanillaRelease --stacktrace --no-daemon
       - run:
           name: Test WordPressUtils
+          environment:
+            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: cd libs/utils && ./gradlew --stacktrace testReleaseUnitTest
       - android/save-gradle-cache
       - android/save-test-results
@@ -36,20 +94,34 @@ jobs:
       api-version: "28"
     steps:
       - git/shallow-checkout
+      - checkout-gutenberg-mobile-submodule-only
       - android/restore-gradle-cache
       - copy-gradle-properties
+      - run:
+          name: Ensure assets folder exists
+          command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
+      - attach_workspace:
+          at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
       - run:
           name: Checkstyle
+          environment:
+            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: ./gradlew --stacktrace checkstyle
       - run:
           name: ktlint
+          environment:
+            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: ./gradlew --stacktrace ciktlint
       - run:
           name: Lint
+          environment:
+            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: ./gradlew --stacktrace lintVanillaRelease || (grep -A20 -B2 'severity="Error"' -r --include="*.xml" WordPress libs; exit 1)
       - run:
           name: Violations
           when: on_fail
+          environment:
+            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: |
             if [ -n "$GITHUB_API_TOKEN" ]; then
               ./gradlew --stacktrace violationCommentsToGitHub -DGITHUB_PULLREQUESTID=${CIRCLE_PULL_REQUEST##*/} -DGITHUB_OAUTH2TOKEN=$GITHUB_API_TOKEN
@@ -64,14 +136,22 @@ jobs:
       api-version: "28"
     steps:
       - git/shallow-checkout
+      - checkout-gutenberg-mobile-submodule-only
       - bundle-install/bundle-install:
           cache_key_prefix: installable-build
       - run:
           name: Copy Secrets
           command: bundle exec fastlane run configure_apply
       - android/restore-gradle-cache
+      - run:
+          name: Ensure assets folder exists
+          command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
+      - attach_workspace:
+          at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
       - run:
           name: Build APK
+          environment:
+            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: |
             if [ -n "$CIRCLE_PULL_REQUEST" ]; then
               PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST)
@@ -104,10 +184,18 @@ jobs:
       api-version: "28"
     steps:
       - git/shallow-checkout
+      - checkout-gutenberg-mobile-submodule-only
       - android/restore-gradle-cache
       - copy-gradle-properties
+      - run:
+          name: Ensure assets folder exists
+          command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
+      - attach_workspace:
+          at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
       - run:
           name: Build
+          environment:
+            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: ./gradlew WordPress:assembleVanillaDebug WordPress:assembleVanillaDebugAndroidTest --stacktrace
       - run:
           name: Decrypt credentials
@@ -138,10 +226,18 @@ jobs:
       api-version: "28"
     steps:
       - git/shallow-checkout
+      - checkout-gutenberg-mobile-submodule-only
       - android/restore-gradle-cache
       - copy-gradle-properties
+      - run:
+          name: Ensure assets folder exists
+          command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
+      - attach_workspace:
+          at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
       - run:
           name: Build
+          environment:
+            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: ./gradlew WordPress:assembleVanillaDebug && cd libs/utils && ./gradlew assembleAndroidTest --stacktrace
       - run:
           name: Decrypt credentials
@@ -161,6 +257,7 @@ jobs:
       - image: circleci/ruby:2.6.4
     steps:
       - git/shallow-checkout
+      - checkout-gutenberg-mobile-submodule-only
       - run:
           name: Install bundler
           command: gem install bundler --version 2.0.2 
@@ -173,18 +270,29 @@ jobs:
 workflows:
   wordpress_android:
     jobs:
+      - gutenberg-bundle-build
       - strings-check
-      - test
-      - lint
+      - test:
+          requires:
+            - gutenberg-bundle-build
+      - lint:
+          requires:
+            - gutenberg-bundle-build
       - Installable Build:
+          requires:
+            - gutenberg-bundle-build
           filters:
             branches:
               ignore: /pull\/[0-9]+/
       - WordPressUtils Connected Tests:
+          requires:
+            - gutenberg-bundle-build
           filters:
             branches:
               ignore: /pull\/[0-9]+/
       - Connected Tests:
+          requires:
+            - gutenberg-bundle-build
           post-to-slack: true
           # Always run connected tests on develop and release branches
           filters:
diff --git a/WordPress/lint-baseline.xml b/WordPress/lint-baseline.xml
index 6e14796f1ffa..42c2fd629297 100644
--- a/WordPress/lint-baseline.xml
+++ b/WordPress/lint-baseline.xml
@@ -46,6 +46,22 @@
             column="20"/>
     </issue>
 
+    <issue
+        id="RtlSetPadding"
+        severity="Error"
+        message="For RtL compatibility, use setPaddingRelativeor ViewCompat.setPaddingRelative() when setting left/right padding."
+        category="Internationalization:Bidirectional Text"
+        priority="6"
+        summary="Using setPadding instead of setPaddingRelative."
+        explanation="For RtL compatibility, use setPaddingRelativeor ViewCompat.setPaddingRelative() when setting left/right padding."
+        errorLine1="            view.setPadding("
+        errorLine2="            ^">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
+            line="550"
+            column="13"/>
+    </issue>
+
     <issue
         id="ClickableViewAccessibility"
         message="Custom view `RecyclableWrapperViewGroup` overrides `onTouchEvent` but not `performClick`"
@@ -3900,6 +3916,270 @@
             column="9"/>
     </issue>
 
+    <issue
+        id="InlinedApi"
+        severity="Error"
+        message="Field requires API level 23 (current min is 21): `android.text.Layout#BREAK_STRATEGY_HIGH_QUALITY`"
+        category="Correctness"
+        priority="6"
+        summary="Using inlined constants on older versions"
+        explanation="This check scans through all the Android API field references in the application and flags certain constants, such as static final integers and Strings, which were introduced in later versions. These will actually be copied into the class files rather than being referenced, which means that the value is available even when running on older devices. In some cases that&apos;s fine, and in other cases it can result in a runtime crash or incorrect behavior. It depends on the context, so consider the code carefully and decide whether it&apos;s safe and can be suppressed or whether the code needs to be guarded.&#xA;&#xA;If you really want to use this API and don&apos;t need to support older devices just set the `minSdkVersion` in your `build.gradle` or `AndroidManifest.xml` files.&#xA;&#xA;If your code is **deliberately** accessing newer APIs, and you have ensured (e.g. with conditional execution) that this code will only ever be called on a supported platform, then you can annotate your class or method with the `@TargetApi` annotation specifying the local minimum SDK to apply, such as `@TargetApi(11)`, such that this check considers 11 rather than your manifest file&apos;s minimum SDK as the required API level."
+        errorLine1="                Layout.BREAK_STRATEGY_SIMPLE : Layout.BREAK_STRATEGY_HIGH_QUALITY;"
+        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactTextInputShadowNodeFork.java"
+            line="53"
+            column="48"/>
+    </issue>
+
+    <issue
+        id="InlinedApi"
+        severity="Error"
+        message="Field requires API level 23 (current min is 21): `android.text.Layout#BREAK_STRATEGY_SIMPLE`"
+        category="Correctness"
+        priority="6"
+        summary="Using inlined constants on older versions"
+        explanation="This check scans through all the Android API field references in the application and flags certain constants, such as static final integers and Strings, which were introduced in later versions. These will actually be copied into the class files rather than being referenced, which means that the value is available even when running on older devices. In some cases that&apos;s fine, and in other cases it can result in a runtime crash or incorrect behavior. It depends on the context, so consider the code carefully and decide whether it&apos;s safe and can be suppressed or whether the code needs to be guarded.&#xA;&#xA;If you really want to use this API and don&apos;t need to support older devices just set the `minSdkVersion` in your `build.gradle` or `AndroidManifest.xml` files.&#xA;&#xA;If your code is **deliberately** accessing newer APIs, and you have ensured (e.g. with conditional execution) that this code will only ever be called on a supported platform, then you can annotate your class or method with the `@TargetApi` annotation specifying the local minimum SDK to apply, such as `@TargetApi(11)`, such that this check considers 11 rather than your manifest file&apos;s minimum SDK as the required API level."
+        errorLine1="                Layout.BREAK_STRATEGY_SIMPLE : Layout.BREAK_STRATEGY_HIGH_QUALITY;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactTextInputShadowNodeFork.java"
+            line="53"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="WrongConstant"
+        severity="Error"
+        message="Must be one of: android.graphics.text.LineBreaker.JUSTIFICATION_MODE_NONE, android.graphics.text.LineBreaker.JUSTIFICATION_MODE_INTER_WORD"
+        category="Correctness"
+        priority="6"
+        summary="Incorrect constant"
+        explanation="Ensures that when parameter in a method only allows a specific set of constants, calls obey those rules."
+        errorLine1="                view.setJustificationMode(Layout.JUSTIFICATION_MODE_INTER_WORD);"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
+            line="337"
+            column="43"/>
+    </issue>
+
+    <issue
+        id="WrongConstant"
+        severity="Error"
+        message="Must be one of: android.graphics.text.LineBreaker.JUSTIFICATION_MODE_NONE, android.graphics.text.LineBreaker.JUSTIFICATION_MODE_INTER_WORD"
+        category="Correctness"
+        priority="6"
+        summary="Incorrect constant"
+        explanation="Ensures that when parameter in a method only allows a specific set of constants, calls obey those rules."
+        errorLine1="                view.setJustificationMode(Layout.JUSTIFICATION_MODE_NONE);"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
+            line="342"
+            column="43"/>
+    </issue>
+
+    <issue
+        id="GradleDependency"
+        severity="Warning"
+        message="A newer version of com.android.tools.build:gradle than 3.4.2 is available: 3.6.3"
+        category="Correctness"
+        priority="4"
+        summary="Obsolete Gradle Dependency"
+        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
+        errorLine1="        classpath &apos;com.android.tools.build:gradle:3.4.2&apos;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build.gradle"
+            line="18"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="GradleDependency"
+        severity="Warning"
+        message="A newer version of androidx.appcompat:appcompat than 1.0.0 is available: 1.1.0"
+        category="Correctness"
+        priority="4"
+        summary="Obsolete Gradle Dependency"
+        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
+        errorLine1="    implementation &apos;androidx.appcompat:appcompat:1.0.0&apos;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/build.gradle"
+            line="104"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="GradleDependency"
+        severity="Warning"
+        message="A newer version of androidx.appcompat:appcompat than 1.0.0 is available: 1.1.0"
+        category="Correctness"
+        priority="4"
+        summary="Obsolete Gradle Dependency"
+        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
+        errorLine1="    implementation &apos;androidx.appcompat:appcompat:1.0.0&apos;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/build.gradle"
+            line="109"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="GradleDependency"
+        severity="Warning"
+        message="A newer version of androidx.recyclerview:recyclerview than 1.0.0 is available: 1.1.0"
+        category="Correctness"
+        priority="4"
+        summary="Obsolete Gradle Dependency"
+        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
+        errorLine1="    implementation &apos;androidx.recyclerview:recyclerview:1.0.0&apos;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/build.gradle"
+            line="110"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="VisibleForTests"
+        severity="Warning"
+        message="This method should only be accessed from tests or within private scope"
+        category="Correctness"
+        priority="4"
+        summary="Visible Only For Tests"
+        explanation="With the `@VisibleForTesting` annotation you can specify an `otherwise=` attribute which specifies the intended visibility if the method had not been made more widely visible for the tests.&#xA;&#xA;This check looks for accesses from production code (e.g. not tests) where the access would not have been allowed with the intended production visibility."
+        errorLine1="    @ReactProp(name = PROP_TEXT)"
+        errorLine2="                      ~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecTextShadowNode.java"
+            line="18"
+            column="23"/>
+    </issue>
+
+    <issue
+        id="UseSparseArrays"
+        severity="Warning"
+        message="Use `new SparseArray&lt;Media>(...)` instead for better performance"
+        category="Performance"
+        priority="4"
+        summary="HashMap can be replaced with SparseArray"
+        explanation="For maps where the keys are of type integer, it&apos;s typically more efficient to use the Android `SparseArray` API. This check identifies scenarios where you might want to consider using `SparseArray` instead of `HashMap` for better performance.&#xA;&#xA;This is **particularly** useful when the value types are primitives like ints, where you can use `SparseIntArray` and avoid auto-boxing the values from `int` to `Integer`.&#xA;&#xA;If you need to construct a `HashMap` because you need to call an API outside of your control which requires a `Map`, you can suppress this warning using for example the `@SuppressLint` annotation."
+        errorLine1="    private HashMap&lt;Integer, Media> mMediaToAddAfterMounting = new HashMap&lt;>();"
+        errorLine2="                                                               ~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java"
+            line="85"
+            column="64"/>
+    </issue>
+
+    <issue
+        id="IconColors"
+        severity="Warning"
+        message="Action Bar icons should use a single gray color (`#333333` for light themes (with 60%/30% opacity for enabled/disabled), and `#FFFFFF` with opacity 80%/30% for dark themes"
+        category="Usability:Icons"
+        priority="6"
+        summary="Icon colors do not follow the recommended visual style"
+        explanation="Notification icons and Action Bar icons should only white and shades of gray. See the Android Design Guide for more details. Note that the way Lint decides whether an icon is an action bar icon or a notification icon is based on the filename prefix: `ic_menu_` for action bar icons, `ic_stat_` for notification icons etc. These correspond to the naming conventions documented in http://developer.android.com/guide/practices/ui_guidelines/icon_design.html"
+        url="http://developer.android.com/design/style/iconography.html"
+        urls="http://developer.android.com/design/style/iconography.html">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/res/drawable-hdpi/ic_launcher.png"/>
+    </issue>
+
+    <issue
+        id="IconColors"
+        severity="Warning"
+        message="Action Bar icons should use a single gray color (`#333333` for light themes (with 60%/30% opacity for enabled/disabled), and `#FFFFFF` with opacity 80%/30% for dark themes"
+        category="Usability:Icons"
+        priority="6"
+        summary="Icon colors do not follow the recommended visual style"
+        explanation="Notification icons and Action Bar icons should only white and shades of gray. See the Android Design Guide for more details. Note that the way Lint decides whether an icon is an action bar icon or a notification icon is based on the filename prefix: `ic_menu_` for action bar icons, `ic_stat_` for notification icons etc. These correspond to the naming conventions documented in http://developer.android.com/guide/practices/ui_guidelines/icon_design.html"
+        url="http://developer.android.com/design/style/iconography.html"
+        urls="http://developer.android.com/design/style/iconography.html">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/res/drawable-mdpi/ic_launcher.png"/>
+    </issue>
+
+    <issue
+        id="IconColors"
+        severity="Warning"
+        message="Action Bar icons should use a single gray color (`#333333` for light themes (with 60%/30% opacity for enabled/disabled), and `#FFFFFF` with opacity 80%/30% for dark themes"
+        category="Usability:Icons"
+        priority="6"
+        summary="Icon colors do not follow the recommended visual style"
+        explanation="Notification icons and Action Bar icons should only white and shades of gray. See the Android Design Guide for more details. Note that the way Lint decides whether an icon is an action bar icon or a notification icon is based on the filename prefix: `ic_menu_` for action bar icons, `ic_stat_` for notification icons etc. These correspond to the naming conventions documented in http://developer.android.com/guide/practices/ui_guidelines/icon_design.html"
+        url="http://developer.android.com/design/style/iconography.html"
+        urls="http://developer.android.com/design/style/iconography.html">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/res/drawable-xhdpi/ic_launcher.png"/>
+    </issue>
+
+    <issue
+        id="IconColors"
+        severity="Warning"
+        message="Action Bar icons should use a single gray color (`#333333` for light themes (with 60%/30% opacity for enabled/disabled), and `#FFFFFF` with opacity 80%/30% for dark themes"
+        category="Usability:Icons"
+        priority="6"
+        summary="Icon colors do not follow the recommended visual style"
+        explanation="Notification icons and Action Bar icons should only white and shades of gray. See the Android Design Guide for more details. Note that the way Lint decides whether an icon is an action bar icon or a notification icon is based on the filename prefix: `ic_menu_` for action bar icons, `ic_stat_` for notification icons etc. These correspond to the naming conventions documented in http://developer.android.com/guide/practices/ui_guidelines/icon_design.html"
+        url="http://developer.android.com/design/style/iconography.html"
+        urls="http://developer.android.com/design/style/iconography.html">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/res/drawable-xxhdpi/ic_launcher.png"/>
+    </issue>
+
+    <issue
+        id="ViewConstructor"
+        severity="Warning"
+        message="Custom view `ReactAztecText` is missing constructor used by tools: `(Context)` or `(Context,AttributeSet)` or `(Context,AttributeSet,int)`"
+        category="Usability"
+        priority="3"
+        summary="Missing View constructors for XML inflation"
+        explanation="Some layout tools (such as the Android layout editor) need to find a constructor with one of the following signatures:&#xA;* `View(Context context)`&#xA;* `View(Context context, AttributeSet attrs)`&#xA;* `View(Context context, AttributeSet attrs, int defStyle)`&#xA;&#xA;If your custom view needs to perform initialization which does not apply when used in a layout editor, you can surround the given code with a check to see if `View#isInEditMode()` is false, since that method will return `false` at runtime but true within a user interface editor."
+        errorLine1="public class ReactAztecText extends AztecText {"
+        errorLine2="             ~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java"
+            line="49"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="RtlGetPadding"
+        severity="Error"
+        message="For RtL compatibility, use getPaddingStart() and getPaddingEnd() or their ViewCompat version, when getting left/right padding."
+        category="Internationalization:Bidirectional Text"
+        priority="6"
+        summary="Using getPaddingLeft/Right instead of getPaddingStart/End."
+        explanation="For RtL compatibility, use getPaddingStart() and getPaddingEnd() or their ViewCompat version, when getting left/right padding."
+        errorLine1="                    (int) update.getPaddingLeft(),"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
+            line="551"
+            column="27"/>
+    </issue>
+
+    <issue
+        id="RtlGetPadding"
+        severity="Error"
+        message="For RtL compatibility, use getPaddingStart() and getPaddingEnd() or their ViewCompat version, when getting left/right padding."
+        category="Internationalization:Bidirectional Text"
+        priority="6"
+        summary="Using getPaddingLeft/Right instead of getPaddingStart/End."
+        explanation="For RtL compatibility, use getPaddingStart() and getPaddingEnd() or their ViewCompat version, when getting left/right padding."
+        errorLine1="                    (int) update.getPaddingRight(),"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../libs/gutenberg-mobile/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
+            line="553"
+            column="27"/>
+    </issue>
+
     <issue
         id="RtlHardcoded"
         severity="Error"
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java
index 4bd6f3f06020..2c3a2c00bc14 100644
--- a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java
+++ b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java
@@ -176,7 +176,7 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         if (currentVersion <= DB_LAST_VERSION_WITHOUT_MIGRATION_SCRIPT) {
             // versions 0 - 136 didn't support migration scripts, so we can safely drop and recreate all tables
             reset(db);
-            currentVersion = DB_LAST_VERSION_WITHOUT_MIGRATION_SCRIPT;
+            currentVersion = newVersion;
         }
 
         switch (currentVersion) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
index 363142b101c7..b12d4e90379d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
@@ -980,6 +980,7 @@ public static void loginWithoutMagicLink(Activity activity) {
     public static void openUrlExternal(Context context, @NonNull String url) {
         Uri uri = Uri.parse(url);
         Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
         try {
             // disable deeplinking activity so to not catch WP URLs
diff --git a/build.gradle b/build.gradle
index 9d0a682d2ba9..89908d08b20c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,18 @@ plugins {
 apply plugin: 'com.automattic.android.fetchstyle'
 
 project.ext.buildGutenbergFromSource = project.properties.getOrDefault('wp.BUILD_GUTENBERG_FROM_SOURCE', false).toBoolean()
+def suppressJSBundle =  System.getenv('SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD').asBoolean()
+project.ext.buildGutenbergMobileJSBundle = !(suppressJSBundle || project.ext.buildGutenbergFromSource)
+
+if (project.ext.buildGutenbergFromSource) {
+    def nodeModulesDir = new File('libs/gutenberg-mobile/node_modules')
+    if (!nodeModulesDir.exists()) {
+        def message = "Attempting to build Gutenberg from source without a libs/gutenberg-mobile/node_modules directory. \
+Either run `yarn install` manually within libs/gutenberg-mobile or disable building Gutenberg from source by \
+setting wp.BUILD_GUTENBERG_FROM_SOURCE to false."
+        throw new GradleException(message)
+    }
+}
 
 allprojects {
     apply plugin: 'checkstyle'
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 7e0f4d19236a..f518797e5215 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -11,7 +11,7 @@
     <!-- Excludes given file patterns from scan.              -->
     <!-- See http://checkstyle.sf.net/config_filefilters.html -->
     <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="[/\\]gen[/\\]|[/\\]node_modules[/\\]|[/\\]react-native-aztec[/\\]"/>
+        <property name="fileNamePattern" value="[/\\]gen[/\\]|[/\\]node_modules[/\\]|[/\\]gutenberg-mobile[/\\]|[/\\]react-native-aztec[/\\]"/>
     </module>
 
     <!-- Checks whether files end with a new line.                        -->
diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle
index fec439925a2d..758761e072b5 100644
--- a/libs/editor/WordPressEditor/build.gradle
+++ b/libs/editor/WordPressEditor/build.gradle
@@ -28,9 +28,6 @@ apply plugin: 'signing'
 // import the `submoduleGitHash()` function
 apply from: 'https://gist.githubusercontent.com/hypest/e06f6097065728b6db7b7c462f8fef1a/raw/3b91756fca76e4c2a9b573313e186c47842e1f7d/submoduleGitHash.gradle'
 
-// import the `waitJitpack()` function
-apply from: 'https://gist.githubusercontent.com/hypest/f526fe0775dedce0ce0133f1400d22a4/raw/0008b271a0d28fc79957fd3c2a027f57e98f796a/wait-jitpack.gradle'
-
 android {
     compileSdkVersion 28
 
@@ -78,23 +75,10 @@ dependencies {
     api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-shortcodes:$aztecVersion")
     api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-comments:$aztecVersion")
 
-    debugImplementation files("./libs/hermes-debug.aar")
-    releaseImplementation files("./libs/hermes-release.aar")
-
-    if (rootProject.ext.has("buildGutenbergFromSource") && rootProject.ext.buildGutenbergFromSource) {
-        implementation (project(':react-native-gutenberg-bridge')) {
-            exclude group: 'com.squareup.okhttp3'
-            exclude group: "com.android.volley"
-            exclude group: 'com.google.code.findbugs'
-        }
-    } else {
-        implementation (waitJitpack('com.github.wordpress-mobile', 'gutenberg-mobile', submoduleGitHash('../../../', 'libs/gutenberg-mobile'))) {
-            // Inheriting RN's okhttp version can interfere with FluxC SSL handling
-            // See https://github.com/wordpress-mobile/WordPress-Android/issues/9032 and https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/919
-            exclude group: 'com.squareup.okhttp3'
-            exclude group: "com.android.volley"
-            exclude group: 'com.google.code.findbugs'
-        }
+    implementation (project(':react-native-gutenberg-bridge')) {
+        exclude group: 'com.squareup.okhttp3'
+        exclude group: "com.android.volley"
+        exclude group: 'com.google.code.findbugs'
     }
 
     // Required Aztec dependencies (they should be included but Jitpack seems to be stripping these out)
diff --git a/libs/editor/WordPressEditor/libs/hermes-debug.aar b/libs/editor/WordPressEditor/libs/hermes-debug.aar
deleted file mode 100644
index 74bd4ae5cba7..000000000000
Binary files a/libs/editor/WordPressEditor/libs/hermes-debug.aar and /dev/null differ
diff --git a/libs/editor/WordPressEditor/libs/hermes-release.aar b/libs/editor/WordPressEditor/libs/hermes-release.aar
deleted file mode 100644
index cc208310ea2d..000000000000
Binary files a/libs/editor/WordPressEditor/libs/hermes-release.aar and /dev/null differ
diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile
index bffe9d267809..891739a9ab45 160000
--- a/libs/gutenberg-mobile
+++ b/libs/gutenberg-mobile
@@ -1 +1 @@
-Subproject commit bffe9d267809f1e336527ca20d805c2207751300
+Subproject commit 891739a9ab4586cce8abb69ad414f55ddd58831d
diff --git a/settings.gradle b/settings.gradle
index 519d72b1874e..c93240da283e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,6 +9,12 @@ include ':libs:login:WordPressLoginFlow'
 include ':WordPressMocks'
 project(':WordPressMocks').projectDir = new File(rootProject.projectDir, properties.getOrDefault('wp.wordpress_mocks_path', 'libs/mocks') + '/WordPressMocks')
 
+include ':react-native-aztec'
+project(':react-native-aztec').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/react-native-aztec/android')
+
+include ':react-native-gutenberg-bridge'
+project(':react-native-gutenberg-bridge').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/react-native-gutenberg-bridge/android')
+
 if (properties.getOrDefault('wp.BUILD_GUTENBERG_FROM_SOURCE', false).toBoolean()) {
     include ':react-native-linear-gradient'
     project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/node_modules/react-native-linear-gradient/android')