diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f169608b7f8aa..100bc1276ffd33 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,51 +2,59 @@ aliases:
   # Cache Management
   - &restore-yarn-cache
     keys:
-      - v1-yarn-{{ arch }}-{{ checksum "package.json" }}
+      - v1-yarn-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}
       # Fallback in case checksum fails
-      - v1-yarn-{{ arch }}-
+      - v1-yarn-{{ arch }}-{{ .Branch }}-
+      # Fallback in case this is a first-time run on a fork
+      - v1-yarn-{{ arch }}-master-
   - &save-yarn-cache
     paths:
       - node_modules
       - ~/.cache/yarn
-    key: v1-yarn-{{ arch }}-{{ checksum "package.json" }}
+    key: v1-yarn-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}
 
   - &restore-cache-analysis
     keys:
-      - v1-analysis-dependencies-{{ arch }}-{{ checksum "package.json" }}{{ checksum "bots/package.json" }}
+      - v1-analysis-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}{{ checksum "bots/package.json" }}
       # Fallback in case checksum fails
-      - v1-analysis-dependencies-{{ arch }}-
+      - v1-analysis-dependencies-{{ arch }}-{{ .Branch }}-
+      # Fallback in case this is a first-time run on a fork
+      - v1-analysis-dependencies-{{ arch }}-master-
   - &save-cache-analysis
     paths:
       - bots/node_modules
       - node_modules
-    key: v1-analysis-dependencies-{{ arch }}-{{ checksum "package.json" }}{{ checksum "bots/package.json" }}
+    key: v1-analysis-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}{{ checksum "bots/package.json" }}
 
   - &restore-cache-android-packages
     keys:
-      - v1-android-sdkmanager-packages-{{ arch }}-api-26-alpha-{{ checksum "scripts/circle-ci-android-setup.sh" }}
+      - v1-android-sdkmanager-packages-{{ arch }}-{{ .Branch }}-api-26-alpha-{{ checksum "scripts/circle-ci-android-setup.sh" }}
       # Fallback in case checksum fails
-      - v1-android-sdkmanager-packages-{{ arch }}-api-26-alpha-
+      - v1-android-sdkmanager-packages-{{ arch }}-{{ .Branch }}-api-26-alpha-
+      # Fallback in case this is a first-time run on a fork
+      - v1-android-sdkmanager-packages-{{ arch }}-master-api-26-alpha-
   - &save-cache-android-packages
     paths:
       - /opt/android/sdk
-    key: v1-android-sdkmanager-packages-{{ arch }}-api-26-alpha-{{ checksum "scripts/circle-ci-android-setup.sh" }}
+    key: v1-android-sdkmanager-packages-{{ arch }}-{{ .Branch }}-api-26-alpha-{{ checksum "scripts/circle-ci-android-setup.sh" }}
 
   - &restore-cache-ndk
     keys:
-      - v2-android-ndk-{{ arch }}-r10e-32-64
+      - v2-android-ndk-{{ arch }}-r10e-32-64-{{ checksum "scripts/circle-ci-android-setup.sh" }}
+      # Fallback in case checksum fails
+      - v2-android-ndk-{{ arch }}-r10e-32-64-
   - &save-cache-ndk
     paths:
       - /opt/ndk
-    key: v2-android-ndk-{{ arch }}-r10e-32-64
+    key: v2-android-ndk-{{ arch }}-r10e-32-64-{{ checksum "scripts/circle-ci-android-setup.sh" }}
 
   - &restore-cache-buck
     keys:
-      - v2-buck-{{ arch }}-v2017.11.16.01
+      - v2-buck-{{ arch }}-v2018.02.16.01
   - &save-cache-buck
     paths:
       - ~/buck
-    key: v2-buck-{{ arch }}-v2017.11.16.01
+    key: v2-buck-{{ arch }}-v2018.02.16.01
 
   - &restore-cache-watchman
     keys:
@@ -81,8 +89,8 @@ aliases:
 
   # Dependency Management
   - &install-ndk
-    |
-      source scripts/circle-ci-android-setup.sh && getAndroidNDK
+    name: Install Android NDK
+    command: source scripts/circle-ci-android-setup.sh && getAndroidNDK
 
   - &yarn
     |
@@ -101,7 +109,7 @@ aliases:
   - &install-buck
     |
       if [[ ! -e ~/buck ]]; then
-        git clone https://github.com/facebook/buck.git ~/buck --branch v2017.11.16.01 --depth=1
+        git clone https://github.com/facebook/buck.git ~/buck --branch v2018.02.16.01 --depth=1
       fi
       cd ~/buck && ant
       buck --version
@@ -128,8 +136,8 @@ aliases:
       source $BASH_ENV
 
   - &install-android-packages
-    | 
-      source scripts/circle-ci-android-setup.sh && getAndroidSDK
+    name: Install Android SDK Packages
+    command: source scripts/circle-ci-android-setup.sh && getAndroidSDK
 
   - &install-android-build-dependencies
     name: Install Android Build Dependencies
@@ -137,6 +145,14 @@ aliases:
       sudo apt-get update -y
       sudo apt-get install ant autoconf automake g++ gcc libqt5widgets5 lib32z1 lib32stdc++6  make maven python-dev python3-dev qml-module-qtquick-controls qtdeclarative5-dev file -y
 
+  - &validate-android-sdk
+    name: Validate Android SDK Install
+    command: ./scripts/validate-android-sdk.sh
+
+  - &validate-android-test-env
+    name: Validate Android Test Environment
+    command: ./scripts/validate-android-test-env.sh
+
   # Test Definitions
   - &run-js-tests
     name: JavaScript Test Suite
@@ -152,6 +168,13 @@ aliases:
     command: yarn flow check
     when: always
 
+  - &run-sanity-checks
+    name: Sanity checks
+    command: |
+      ./scripts/circleci/check_license.sh
+      ./scripts/circleci/check_cache.sh
+    when: always
+    
   - &build-android-app
     name: Build Android App
     command: |
@@ -190,7 +213,7 @@ aliases:
       if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then	
         echo "JavaScript bundle missing, cannot run instrumentation tests. Verify build-js-bundle step completed successfully."; exit 1;
       fi
-      source scripts/circle-ci-android-setup.sh && NO_BUCKD=1 retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
+      source scripts/circle-ci-android-setup.sh && NO_BUCKD=1 retry3 timeout 300 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
   
   - &collect-android-test-results
     name: Collect Test Results
@@ -204,21 +227,21 @@ aliases:
     name: Initial Setup
     command: | 
       mkdir -p ~/react-native/reports/junit/
-
-  - &run-objc_ios-tests
-    name: Objective-C iOS Test Suite
-    command: ./scripts/objc-test-ios.sh
+  
+  - &run-objc-ios-tests
+    name: iOS Test Suite
+    command: ./scripts/objc-test-ios.sh test
 
   - &run-objc-tvos-tests
-    name: Objective-C tvOS Test Suite
-    command: ./scripts/objc-test-tvos.sh
+    name: tvOS Test Suite
+    command: ./scripts/objc-test-tvos.sh test
 
   - &run-objc-ios-e2e-tests
-    name: Objective-C iOS End-to-End Test Suite
+    name: iOS End-to-End Test Suite
     command: node ./scripts/run-ci-e2e-tests.js --ios --js --retries 3;
 
   - &run-objc-tvos-e2e-tests
-    name: Objective-C tvOS End-to-End Test Suite
+    name: tvOS End-to-End Test Suite
     command: node ./scripts/run-ci-e2e-tests.js --tvos --js --retries 3;
 
 defaults: &defaults
@@ -245,7 +268,7 @@ android_defaults: &android_defaults
 macos_defaults: &macos_defaults
   <<: *defaults
   macos:
-    xcode: "9.0"
+    xcode: "9.2.0"
 
 version: 2
 jobs:
@@ -261,13 +284,16 @@ jobs:
       - run: *yarn
       - save-cache: *save-yarn-cache
 
+      # Basic checks against the checkout, cache...
+      - run: *run-sanity-checks
+
       - persist_to_workspace:
           root: .
           paths: .
 
   # Runs JavaScript lint and flow checks.
   # Currently will fail a PR if lint/flow raises issues.
-  js_checks:
+  analyze:
     <<: *js_defaults
     steps:
       - attach_workspace:
@@ -278,8 +304,6 @@ jobs:
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
       - store_artifacts:
           path: ~/react-native/yarn.lock
 
@@ -294,8 +318,6 @@ jobs:
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
 
   # Runs JavaScript tests on Node 6
   test_javascript_node6_compatibility:
@@ -314,65 +336,51 @@ jobs:
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
 
   # Runs unit tests on iOS devices
-  test_objc_ios:
+  test_ios:
     <<: *macos_defaults
-    dependencies:
-      pre:
-        - xcrun instruments -w "iPhone 5s (10.3.1)" || true
     steps:
       - attach_workspace:
           at: ~/react-native
 
-      - run: *run-objc_ios-tests
+      - run: xcrun instruments -w "iPhone 5s (11.1)" || true
+      - run: brew install watchman
+      - run: *run-objc-ios-tests
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
 
   # Runs unit tests on tvOS devices
-  test_objc_tvos:
+  test_tvos:
     <<: *macos_defaults
-    dependencies:
-      pre:
-        - xcrun instruments -w "Apple TV 1080p (10.0)" || true
     steps:
       - attach_workspace:
           at: ~/react-native
 
+      - run: xcrun instruments -w "Apple TV 1080p (11.1)" || true
+      - run: brew install watchman
       - run: *run-objc-tvos-tests
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
 
   # Runs end to end tests
-  test_objc_ios_e2e:
+  test_ios_e2e:
     <<: *macos_defaults
-    dependencies:
-      pre:
-        - xcrun instruments -w "iPhone 5s (10.3.1)" || true
     steps:
       - attach_workspace:
           at: ~/react-native
 
+      - run: xcrun instruments -w "iPhone 5s (11.1)" || true
       - run: *run-objc-ios-e2e-tests
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
 
   # Checks podspec
   test_podspec:
-    <<: *defaults
-    macos:
-      xcode: "9.0"
+    <<: *macos_defaults
     steps:
       - attach_workspace:
           at: ~/react-native
@@ -383,9 +391,9 @@ jobs:
   publish_npm_package:
     <<: *android_defaults
     steps:
-      - attach_workspace:
-          at: ~/react-native
-
+      # Checkout code so that we can work with `git` in publish.js
+      - checkout
+      
       # Configure Android SDK and related dependencies
       - run: *configure-android-path
       - run: *install-android-build-dependencies
@@ -444,6 +452,8 @@ jobs:
       - run: *install-android-packages
       - save-cache: *save-cache-android-packages
 
+      - run: *validate-android-sdk
+
       # Starting emulator in advance as it takes some time to boot.      
       - run: *create-avd
       - run: *launch-avd
@@ -461,6 +471,8 @@ jobs:
       - run: *install-buck
       - save-cache: *save-cache-buck
 
+      - run: *validate-android-test-env
+
       - run: buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
       - run: buck fetch ReactAndroid/src/main/java/com/facebook/react
       - run: buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
@@ -478,7 +490,7 @@ jobs:
 
       # Wait for AVD to finish booting before running tests
       - run: *wait-for-avd
-            
+
       # Test Suite
       - run: *run-android-unit-tests
       - run: *run-android-instrumentation-tests
@@ -487,8 +499,6 @@ jobs:
       - run: *collect-android-test-results
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
 
 
   # Analyze pull request and raise any lint/flow issues.
@@ -517,8 +527,9 @@ jobs:
       - run:
           name: Analyze Pull Request
           command: |
+            # DANGER_GITHUB_API_TOKEN=Facebook-Open-Source-Bot public_repo access token
             if [ -n "$CIRCLE_PR_NUMBER" ]; then
-              cd bots && DANGER_GITHUB_API_TOKEN="e622517d9f1136ea8900""07c6373666312cdfaa69" yarn danger
+              cd bots && DANGER_GITHUB_API_TOKEN="b186c9a82bab3b08ec80""c0818117619eec6f281a" yarn danger
             else
               echo "Skipping pull request analysis."            
             fi
@@ -526,6 +537,7 @@ jobs:
       - run:
           name: Analyze Code
           command: |
+            # GITHUB_TOKEN=eslint-bot public_repo access token
             if [ -n "$CIRCLE_PR_NUMBER" ]; then
               cat <(echo eslint; yarn --silent lint --format=json; echo flow; yarn --silent flow check --json) | GITHUB_TOKEN="af6ef0d15709bc91d""06a6217a5a826a226fb57b7" CI_USER=$CIRCLE_PROJECT_USERNAME CI_REPO=$CIRCLE_PROJECT_REPONAME PULL_REQUEST_NUMBER=$CIRCLE_PR_NUMBER node bots/code-analysis-bot.js
             else
@@ -537,15 +549,15 @@ jobs:
 workflows:
   version: 2
 
-  test:
+  tests:
     jobs:
 
       # Checkout repo and run Yarn
       - checkout_code:
           filters: *filter-ignore-gh-pages
 
-      # Run lint and flow checks
-      - js_checks:
+      # Run lint, flow, and other checks
+      - analyze:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
@@ -567,17 +579,17 @@ workflows:
             - checkout_code
 
       # Test iOS & tvOS
-      - test_objc_ios:
+      - test_ios:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
-      - test_objc_tvos:
+      - test_tvos:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
 
       # End-to-end tests
-      - test_objc_ios_e2e:
+      - test_ios_e2e:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
@@ -597,16 +609,30 @@ workflows:
 
   # Only runs on NN-stable branches
   deploy:
-    jobs:
-      # Checkout repo and run Yarn
-      - checkout_code:
-          filters: *filter-only-stable
-          
+    jobs:          
       # If we are on a stable branch, wait for approval to deploy to npm
       - approve_publish_npm_package:
           filters: *filter-only-stable
           type: approval
+
       - publish_npm_package:
           requires:
-            - checkout_code
             - approve_publish_npm_package
+
+  # These tests are flaky or are yet to be fixed. They are placed on their own 
+  # workflow to avoid marking benign PRs as broken.
+  # To run them, uncomment the entire block and open a PR (do not merge). 
+  # Once a test is fixed, move the test definition to the 'tests' workflow.
+  # disabled_tests:
+  #   jobs:
+  #     # Checkout repo and run Yarn (pre-req, should succeed)
+  #     - checkout_code:
+  #         filters: *filter-ignore-gh-pages
+
+  #     # The following were DISABLED because they have not run since 
+  #     # the migration from Travis, and they have broken since then,
+  #     # CocoaPods
+  #     - test_podspec:
+  #         filters: *filter-ignore-gh-pages
+  #         requires:
+  #           - checkout_code
diff --git a/.eslintrc b/.eslintrc
index 167d6a58776566..9887d1c6d8dbe0 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -13,6 +13,7 @@
     "flowtype",
     "prettier",
     "react",
+    "react-native",
     "jest"
   ],
 
@@ -169,10 +170,10 @@
 
   // ESLint Comments Plugin
   // The following rules are made available via `eslint-plugin-eslint-comments`
-    'eslint-comments/no-aggregating-enable': 1, // disallows eslint-enable comments for multiple eslint-disable comments
-    'eslint-comments/no-unlimited-disable': 1, // disallows eslint-disable comments without rule names
-    'eslint-comments/no-unused-disable': 1, // disallow disables that don't cover any errors
-    'eslint-comments/no-unused-enable': 1, // // disallow enables that don't enable anything or enable rules that weren't disabled
+    "eslint-comments/no-aggregating-enable": 1, // disallows eslint-enable comments for multiple eslint-disable comments
+    "eslint-comments/no-unlimited-disable": 1, // disallows eslint-disable comments without rule names
+    "eslint-comments/no-unused-disable": 1, // disallow disables that don't cover any errors
+    "eslint-comments/no-unused-enable": 1, // // disallow enables that don't enable anything or enable rules that weren't disabled
 
   // Flow Plugin
   // The following rules are made available via `eslint-plugin-flowtype`
@@ -201,7 +202,7 @@
     "new-parens": 1,                 // disallow the omission of parentheses when invoking a constructor with no arguments
     "no-nested-ternary": 0,          // disallow nested ternary expressions (off by default)
     "no-array-constructor": 1,       // disallow use of the Array constructor
-    'no-empty-character-class': 1,   // disallow the use of empty character classes in regular expressions
+    "no-empty-character-class": 1,   // disallow the use of empty character classes in regular expressions
     "no-lonely-if": 0,               // disallow if as the only statement in an else block (off by default)
     "no-new-object": 1,              // disallow use of the Object constructor
     "no-spaced-func": 1,             // disallow space between function identifier and application
@@ -252,11 +253,48 @@
     "react/self-closing-comp": 1,
     "react/wrap-multilines": 0,
 
+  // React-Native Plugin
+  // The following rules are made available via `eslint-plugin-react-native`
+
+    "react-native/no-inline-styles": 1,
+
   // Jest Plugin
   // The following rules are made available via `eslint-plugin-jest`.
     "jest/no-disabled-tests": 1,
     "jest/no-focused-tests": 1,
     "jest/no-identical-title": 1,
     "jest/valid-expect": 1,
-  }
+  },
+
+  "overrides": [
+    {
+      "files": [
+        "Libraries/**/*.js",
+        "RNTester/**/*.js",
+        "jest/**/*.js",
+      ],
+      "rules": {
+        // These folders currently run through babel and don't need to be
+        // compatible with node 4
+        "comma-dangle": 0,
+      },
+    },
+    {
+      "files": [
+        "local-cli/**/*.js",
+      ],
+      "rules": {
+        // This folder currently runs through babel and doesn't need to be
+        // compatible with node 4
+        "comma-dangle": 0,
+
+        "lint/extra-arrow-initializer": 0,
+        "no-alert": 0,
+        "no-console-disallow": 0,
+      },
+      "env": {
+        "node": true,
+      },
+    },
+  ],
 }
diff --git a/.flowconfig b/.flowconfig
index 735e7816a35829..361d475f24042d 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -52,4 +52,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.65.0
+^0.67.0
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 1f642ca4fb1b84..bbe1d31e0b8f46 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,122 +1,29 @@
 <!--
-  PLEASE DON'T DELETE THIS TEMPLATE UNTIL YOU HAVE READ THE FIRST SECTION.
+  We use GitHub Issues exclusively for tracking bugs in React Native.
+  Please follow this template when preparing your bug report.
 -->
 
-### Is this a bug report?
-
-(write your answer here)
-
-<!--
-  If you answered "Yes":
-
-    We expect that it will take you about 30 minutes to produce a high-quality bug report.
-    While this may seem like a lot, putting care into issues helps us fix them faster.
-    For bug reports, it is REQUIRED to fill the rest of this template, or the issue will be closed.
-
-  If you answered "No":
-
-    We use GitHub Issues exclusively for tracking bugs in React Native. If you're looking for help,
-    the Community page at http://facebook.github.io/react-native/help.html list various resources 
-    that should help you get started.
-
-  Now scroll below!
--->
-
-### Have you read the [Contributing Guidelines](https://facebook.github.io/react-native/docs/contributing.html)?
-
-(Write your answer here.)
+(Describe your issue in detail.)
 
 ### Environment
 
-<!--
-  In your terminal run `react-native info` and paste its contents here. Next, specify your target platform, like this:
-
-  Environment:
-    OS:  macOS Sierra 10.12.6
-    Node:  8.4.0
-    Yarn:  0.27.5
-    npm:  5.4.0
-    Watchman:  4.7.0
-    Xcode:  Xcode 8.3.3 Build version 8E3004b
-    Android Studio:  2.3 AI-162.4069837
-
-  Packages: (wanted => installed)
-    react-native: 0.48.1 => 0.48.1
-    react: 16.0.0-alpha.12 => 16.0.0-alpha.12
-
-  Target Platform: iOS (10.3)
-
-  ***Make sure you are on v0.48.0 or greater of react-native, otherwise you may get this error:
-
-  Unrecognized command 'info'
-  Run react-native --help to see list of all available commands
--->
-
-### Steps to Reproduce
-
-<!--
-  How would you describe your issue to someone who doesn’t know you or your project?
-  Try to write a sequence of steps that anybody can repeat to see the issue.
-  Be specific! If the bug cannot be reproduced, your issue may be closed.
--->
-
-(Write your steps here:)
-
-1.
-2.
-3.
+(Run `react-native info` in your terminal and paste its contents here.)
 
 ### Expected Behavior
 
-<!--
-  How did you expect your project to behave?
-  It’s fine if you’re not sure your understanding is correct.
-  Just write down what you thought would happen.
--->
-
 (Write what you thought would happen.)
 
 ### Actual Behavior
 
-<!--
-  Did something go wrong?
-  Is something broken, or not behaving as you expected?
-  Describe this section in detail, and attach screenshots if possible.
-  Don't just say "it doesn't work"!
--->
+(Write what happened. Include screenshots if needed.)
 
-(Write what happened. Add screenshots!)
+### Steps to Reproduce
 
-### Reproducible Demo
+(Link to Snack, or steps to reproduce.)
 
 <!--
-  Please share a project that reproduces the issue.
-  There are two ways to do it:
-
-    * Create a new app using https://snack.expo.io/ and try to reproduce the issue in it.
-      This is useful if you roughly know where the problem is, or can’t share the real code.
-
-    * Or, copy your app and remove things until you’re left with the minimal reproducible demo.
-      This is useful for finding the root cause. You may then optionally create a Snack.
+  Please share a project that reproduces the issue. 
+  Ideally, create a new app using https://snack.expo.io/ and try to reproduce the issue in it.
 
   This is a good guide to creating bug demos: https://stackoverflow.com/help/mcve
-  Once you’re done, copy and paste the link to the Snack or a public GitHub repository below:
--->
-
-(Paste the link to an example project and exact instructions to reproduce the issue.)
-
-<!--
-  What happens if you skip this step?
-
-  Someone will read your bug report, and maybe will be able to help you,
-  but it’s unlikely that it will get much attention from the team. Eventually,
-  the issue will likely get closed in favor of issues that have reproducible demos.
-
-  Please remember that:
-
-    * Issues without reproducible demos have a very low priority.
-    * The person fixing the bug would have to do that anyway. Please be respectful of their time.
-    * You might figure out the issues yourself as you work on extracting it.
-
-  Thanks for helping us help you!
 -->
diff --git a/.github/stale.yml b/.github/stale.yml
index dc018b58604d55..a738daf3783295 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 180
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: 60
 # Issues with these labels will never be considered stale
 exemptLabels:
   - Good first issue
@@ -11,10 +11,10 @@ exemptLabels:
 staleLabel: Stale 
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs.
-  Maybe the issue has been fixed in a recent release, or perhaps it is not affecting a lot of people.
-  If you think this issue should definitely remain open, please let us know why.
+  Hey there, it looks like there has been no activity on this issue recently. Has the issue been fixed, or does it still require the community's attention? This issue may be closed if no further activity occurs.
+  You may also label this issue as "For Discussion" or "Good first issue" and I will leave it open.
   Thank you for your contributions.
 # Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+closeComment: >
+  Closing this issue after a prolonged period of inactivity. If this issue is still present in the latest release, please feel free to create a new issue with up-to-date information.
+only: issues
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 19c3bbdce24975..6b290712dbd6d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,8 @@ node_modules
 
 # TODO: Check in yarn.lock in open source. Right now we need to keep it out
 # from the GitHub repo as importing it might conflict with internal workspaces
-*/**/yarn.lock
+yarn.lock
+package-lock.json
 
 # OS X
 .DS_Store
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 34a94428f2542b..bc151d02603d62 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -141,11 +141,9 @@ Copy and paste this to the top of your new file(s):
 ```JS
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 ```
 
@@ -210,5 +208,5 @@ However, there are still some styles that the linter cannot pick up.
 
 ## License
 
-By contributing to React Native, you agree that your contributions will be licensed under its BSD license.
+By contributing to React Native, you agree that your contributions will be licensed under its MIT license.
 <!-- generated_contributing_end -->
diff --git a/ContainerShip/scripts/run-android-ci-instrumentation-tests.js b/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
index 34ee3336a168d2..706159c4902bc4 100644
--- a/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
+++ b/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/IntegrationTests/AccessibilityManagerTest.js b/IntegrationTests/AccessibilityManagerTest.js
index dfa9e9a19f289d..74dbe9ba19edab 100644
--- a/IntegrationTests/AccessibilityManagerTest.js
+++ b/IntegrationTests/AccessibilityManagerTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AccessibilityManagerTest
diff --git a/IntegrationTests/AppEventsTest.js b/IntegrationTests/AppEventsTest.js
index 62299ec337858d..ae061e167b86d8 100644
--- a/IntegrationTests/AppEventsTest.js
+++ b/IntegrationTests/AppEventsTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AppEventsTest
  * @flow
diff --git a/IntegrationTests/AsyncStorageTest.js b/IntegrationTests/AsyncStorageTest.js
index ef7df1f1f365e5..3ce0265dd8ceb0 100644
--- a/IntegrationTests/AsyncStorageTest.js
+++ b/IntegrationTests/AsyncStorageTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AsyncStorageTest
diff --git a/IntegrationTests/ImageCachePolicyTest.js b/IntegrationTests/ImageCachePolicyTest.js
index 29b5e68d1d2117..d6fa4f544a1bf9 100644
--- a/IntegrationTests/ImageCachePolicyTest.js
+++ b/IntegrationTests/ImageCachePolicyTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ImageCachePolicyTest
diff --git a/IntegrationTests/ImageSnapshotTest.js b/IntegrationTests/ImageSnapshotTest.js
index ccb232796927ca..8ba7734286d673 100644
--- a/IntegrationTests/ImageSnapshotTest.js
+++ b/IntegrationTests/ImageSnapshotTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ImageSnapshotTest
diff --git a/IntegrationTests/IntegrationTestHarnessTest.js b/IntegrationTests/IntegrationTestHarnessTest.js
index 7c9f2527cabbd0..6291c915d68643 100644
--- a/IntegrationTests/IntegrationTestHarnessTest.js
+++ b/IntegrationTests/IntegrationTestHarnessTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule IntegrationTestHarnessTest
diff --git a/IntegrationTests/IntegrationTestsApp.js b/IntegrationTests/IntegrationTestsApp.js
index 0594e289b7b145..6b255c2befe54a 100644
--- a/IntegrationTests/IntegrationTestsApp.js
+++ b/IntegrationTests/IntegrationTestsApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule IntegrationTestsApp
diff --git a/IntegrationTests/LayoutEventsTest.js b/IntegrationTests/LayoutEventsTest.js
index ab7bc6040d113d..769ff98f6be8b5 100644
--- a/IntegrationTests/LayoutEventsTest.js
+++ b/IntegrationTests/LayoutEventsTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LayoutEventsTest
  * @flow
diff --git a/IntegrationTests/LoggingTestModule.js b/IntegrationTests/LoggingTestModule.js
index ec07f3271bf700..25b409353ce1d4 100644
--- a/IntegrationTests/LoggingTestModule.js
+++ b/IntegrationTests/LoggingTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LoggingTestModule
  */
diff --git a/IntegrationTests/PromiseTest.js b/IntegrationTests/PromiseTest.js
index 9cf8651e3a3511..f6a81e3d6d5d16 100644
--- a/IntegrationTests/PromiseTest.js
+++ b/IntegrationTests/PromiseTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule PromiseTest
diff --git a/IntegrationTests/PropertiesUpdateTest.js b/IntegrationTests/PropertiesUpdateTest.js
index a279c5aed0af08..623dc82c8ee94b 100644
--- a/IntegrationTests/PropertiesUpdateTest.js
+++ b/IntegrationTests/PropertiesUpdateTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  * @providesModule PropertiesUpdateTest
  */
 'use strict';
diff --git a/IntegrationTests/RCTRootViewIntegrationTestApp.js b/IntegrationTests/RCTRootViewIntegrationTestApp.js
index 3793938d7e5adf..a97873d2c3224e 100644
--- a/IntegrationTests/RCTRootViewIntegrationTestApp.js
+++ b/IntegrationTests/RCTRootViewIntegrationTestApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTRootViewIntegrationTestApp
  */
diff --git a/IntegrationTests/ReactContentSizeUpdateTest.js b/IntegrationTests/ReactContentSizeUpdateTest.js
index 3524ef92ed385e..c5f5ae80c246b0 100644
--- a/IntegrationTests/ReactContentSizeUpdateTest.js
+++ b/IntegrationTests/ReactContentSizeUpdateTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  * @providesModule ReactContentSizeUpdateTest
  */
 'use strict';
diff --git a/IntegrationTests/SimpleSnapshotTest.js b/IntegrationTests/SimpleSnapshotTest.js
index 3998118dda8f6e..1c0be2a431d469 100644
--- a/IntegrationTests/SimpleSnapshotTest.js
+++ b/IntegrationTests/SimpleSnapshotTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SimpleSnapshotTest
diff --git a/IntegrationTests/SizeFlexibilityUpdateTest.js b/IntegrationTests/SizeFlexibilityUpdateTest.js
index 77895f40006498..679694a0d631ce 100644
--- a/IntegrationTests/SizeFlexibilityUpdateTest.js
+++ b/IntegrationTests/SizeFlexibilityUpdateTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  * @providesModule SizeFlexibilityUpdateTest
  */
 'use strict';
diff --git a/IntegrationTests/SyncMethodTest.js b/IntegrationTests/SyncMethodTest.js
index 76bb70a81f41d7..6318eaa4f14282 100644
--- a/IntegrationTests/SyncMethodTest.js
+++ b/IntegrationTests/SyncMethodTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SyncMethodTest
diff --git a/IntegrationTests/TimersTest.js b/IntegrationTests/TimersTest.js
index ddd052081cffd4..23da99dc6edbdc 100644
--- a/IntegrationTests/TimersTest.js
+++ b/IntegrationTests/TimersTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TimersTest
diff --git a/IntegrationTests/WebSocketTest.js b/IntegrationTests/WebSocketTest.js
index 78d00701b53683..6e459f913babc3 100644
--- a/IntegrationTests/WebSocketTest.js
+++ b/IntegrationTests/WebSocketTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule WebSocketTest
diff --git a/IntegrationTests/WebViewTest.js b/IntegrationTests/WebViewTest.js
index c0381c639a8256..a41e244b58be3a 100644
--- a/IntegrationTests/WebViewTest.js
+++ b/IntegrationTests/WebViewTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebViewTest
  */
diff --git a/IntegrationTests/launchWebSocketServer.command b/IntegrationTests/launchWebSocketServer.command
index ebb305dc150326..a6531c5f8d78b2 100755
--- a/IntegrationTests/launchWebSocketServer.command
+++ b/IntegrationTests/launchWebSocketServer.command
@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 
 # Copyright (c) 2015-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # Set terminal title
 echo -en "\033]0;Web Socket Test Server\a"
diff --git a/IntegrationTests/websocket_integration_test_server.js b/IntegrationTests/websocket_integration_test_server.js
index b7887f1c5e3753..e338d85ae3b89d 100755
--- a/IntegrationTests/websocket_integration_test_server.js
+++ b/IntegrationTests/websocket_integration_test_server.js
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule websocket_integration_test_server
diff --git a/LICENSE b/LICENSE
index 8085fec497caf6..9e051010d82dc6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,30 +1,21 @@
-BSD License
+MIT License
 
-For React Native software
+Copyright (c) 2015-present, Facebook, Inc.
 
-Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Libraries/.eslintrc b/Libraries/.eslintrc
deleted file mode 100644
index ddcf4e27251d8f..00000000000000
--- a/Libraries/.eslintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "rules": {
-    // This folder currently runs through babel and doesn't need to be
-    // compatible with node 4
-    "comma-dangle": 0
-  }
-}
diff --git a/Libraries/.npmignore b/Libraries/.npmignore
new file mode 100644
index 00000000000000..c912533dd7d2dd
--- /dev/null
+++ b/Libraries/.npmignore
@@ -0,0 +1 @@
+__tests__
diff --git a/Libraries/ART/ARTCGFloatArray.h b/Libraries/ART/ARTCGFloatArray.h
index 9d748549973d30..72286a50527e84 100644
--- a/Libraries/ART/ARTCGFloatArray.h
+++ b/Libraries/ART/ARTCGFloatArray.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // A little helper to make sure we have the right memory allocation ready for use.
diff --git a/Libraries/ART/ARTContainer.h b/Libraries/ART/ARTContainer.h
index d83f7ae1a559f8..532145825bd74b 100644
--- a/Libraries/ART/ARTContainer.h
+++ b/Libraries/ART/ARTContainer.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/ART/ARTGroup.h b/Libraries/ART/ARTGroup.h
index 4d94a9acded24b..d9dcb48c87b180 100644
--- a/Libraries/ART/ARTGroup.h
+++ b/Libraries/ART/ARTGroup.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/ART/ARTGroup.m b/Libraries/ART/ARTGroup.m
index 672c3b6ebeb9f8..1bc70725c030e8 100644
--- a/Libraries/ART/ARTGroup.m
+++ b/Libraries/ART/ARTGroup.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTGroup.h"
diff --git a/Libraries/ART/ARTNode.h b/Libraries/ART/ARTNode.h
index 0ade1f21b57a6c..8b66c205ef2440 100644
--- a/Libraries/ART/ARTNode.h
+++ b/Libraries/ART/ARTNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/UIView+React.h>
diff --git a/Libraries/ART/ARTNode.m b/Libraries/ART/ARTNode.m
index 38b01a0c56c449..b27b014b9e7d0e 100644
--- a/Libraries/ART/ARTNode.m
+++ b/Libraries/ART/ARTNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTNode.h"
diff --git a/Libraries/ART/ARTRenderable.h b/Libraries/ART/ARTRenderable.h
index 8eae9c25ae4a70..e5735a1fbd81ef 100644
--- a/Libraries/ART/ARTRenderable.h
+++ b/Libraries/ART/ARTRenderable.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/ART/ARTRenderable.m b/Libraries/ART/ARTRenderable.m
index 7ba9a9a6073915..d7a3115586f3dd 100644
--- a/Libraries/ART/ARTRenderable.m
+++ b/Libraries/ART/ARTRenderable.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTRenderable.h"
diff --git a/Libraries/ART/ARTSerializablePath.js b/Libraries/ART/ARTSerializablePath.js
index 4e8b3c2271a6c7..7f52bc6540eda2 100644
--- a/Libraries/ART/ARTSerializablePath.js
+++ b/Libraries/ART/ARTSerializablePath.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ARTSerializablePath
  */
diff --git a/Libraries/ART/ARTShape.h b/Libraries/ART/ARTShape.h
index 7d13c268f6e802..ce685c564b06be 100644
--- a/Libraries/ART/ARTShape.h
+++ b/Libraries/ART/ARTShape.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/ART/ARTShape.m b/Libraries/ART/ARTShape.m
index c07d68e62aa4a3..935c8894994a2b 100644
--- a/Libraries/ART/ARTShape.m
+++ b/Libraries/ART/ARTShape.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTShape.h"
diff --git a/Libraries/ART/ARTSurfaceView.h b/Libraries/ART/ARTSurfaceView.h
index 8be8d95040c146..cb42928cedbe12 100644
--- a/Libraries/ART/ARTSurfaceView.h
+++ b/Libraries/ART/ARTSurfaceView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/ART/ARTSurfaceView.m b/Libraries/ART/ARTSurfaceView.m
index 16e2029083de59..c8f46069038603 100644
--- a/Libraries/ART/ARTSurfaceView.m
+++ b/Libraries/ART/ARTSurfaceView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTSurfaceView.h"
diff --git a/Libraries/ART/ARTText.h b/Libraries/ART/ARTText.h
index ee976e329a46e8..cdf8393a137629 100644
--- a/Libraries/ART/ARTText.h
+++ b/Libraries/ART/ARTText.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/ART/ARTText.m b/Libraries/ART/ARTText.m
index dfffde26546656..0953c850dc293e 100644
--- a/Libraries/ART/ARTText.m
+++ b/Libraries/ART/ARTText.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTText.h"
diff --git a/Libraries/ART/ARTTextFrame.h b/Libraries/ART/ARTTextFrame.h
index 1f6b557bfc77af..8ad06e0a01baed 100644
--- a/Libraries/ART/ARTTextFrame.h
+++ b/Libraries/ART/ARTTextFrame.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreText/CoreText.h>
diff --git a/Libraries/ART/Brushes/ARTBrush.h b/Libraries/ART/Brushes/ARTBrush.h
index 05020dd7bafa26..95709e65f19bc9 100644
--- a/Libraries/ART/Brushes/ARTBrush.h
+++ b/Libraries/ART/Brushes/ARTBrush.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
diff --git a/Libraries/ART/Brushes/ARTBrush.m b/Libraries/ART/Brushes/ARTBrush.m
index 1cc762b650f04a..4ade2c221143f7 100644
--- a/Libraries/ART/Brushes/ARTBrush.m
+++ b/Libraries/ART/Brushes/ARTBrush.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTBrush.h"
diff --git a/Libraries/ART/Brushes/ARTLinearGradient.h b/Libraries/ART/Brushes/ARTLinearGradient.h
index d7ff2e5684458f..8e6abbc5fbbfde 100644
--- a/Libraries/ART/Brushes/ARTLinearGradient.h
+++ b/Libraries/ART/Brushes/ARTLinearGradient.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTBrush.h"
diff --git a/Libraries/ART/Brushes/ARTLinearGradient.m b/Libraries/ART/Brushes/ARTLinearGradient.m
index f8412163b319c0..1415a6ffcbc80f 100644
--- a/Libraries/ART/Brushes/ARTLinearGradient.m
+++ b/Libraries/ART/Brushes/ARTLinearGradient.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTLinearGradient.h"
diff --git a/Libraries/ART/Brushes/ARTPattern.h b/Libraries/ART/Brushes/ARTPattern.h
index 5f513ec60e2ae6..ce1767cc9b0bc8 100644
--- a/Libraries/ART/Brushes/ARTPattern.h
+++ b/Libraries/ART/Brushes/ARTPattern.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTBrush.h"
diff --git a/Libraries/ART/Brushes/ARTPattern.m b/Libraries/ART/Brushes/ARTPattern.m
index 0d720613b80182..5c43586452d198 100644
--- a/Libraries/ART/Brushes/ARTPattern.m
+++ b/Libraries/ART/Brushes/ARTPattern.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTPattern.h"
diff --git a/Libraries/ART/Brushes/ARTRadialGradient.h b/Libraries/ART/Brushes/ARTRadialGradient.h
index 7f86d93058ce80..d7895f8b74d084 100644
--- a/Libraries/ART/Brushes/ARTRadialGradient.h
+++ b/Libraries/ART/Brushes/ARTRadialGradient.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTBrush.h"
diff --git a/Libraries/ART/Brushes/ARTRadialGradient.m b/Libraries/ART/Brushes/ARTRadialGradient.m
index 1dd449595316e7..19db9cb97b567a 100644
--- a/Libraries/ART/Brushes/ARTRadialGradient.m
+++ b/Libraries/ART/Brushes/ARTRadialGradient.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTRadialGradient.h"
diff --git a/Libraries/ART/Brushes/ARTSolidColor.h b/Libraries/ART/Brushes/ARTSolidColor.h
index f212c735680f60..a16c2b915c72f8 100644
--- a/Libraries/ART/Brushes/ARTSolidColor.h
+++ b/Libraries/ART/Brushes/ARTSolidColor.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTBrush.h"
diff --git a/Libraries/ART/Brushes/ARTSolidColor.m b/Libraries/ART/Brushes/ARTSolidColor.m
index 900621cfb4ea3c..096c4e043ed429 100644
--- a/Libraries/ART/Brushes/ARTSolidColor.m
+++ b/Libraries/ART/Brushes/ARTSolidColor.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTSolidColor.h"
diff --git a/Libraries/ART/RCTConvert+ART.h b/Libraries/ART/RCTConvert+ART.h
index ef46e4e9341e3c..1deb3c600176ab 100644
--- a/Libraries/ART/RCTConvert+ART.h
+++ b/Libraries/ART/RCTConvert+ART.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <QuartzCore/QuartzCore.h>
diff --git a/Libraries/ART/RCTConvert+ART.m b/Libraries/ART/RCTConvert+ART.m
index 6135dc4f4fd250..ea22d5426f18f9 100644
--- a/Libraries/ART/RCTConvert+ART.m
+++ b/Libraries/ART/RCTConvert+ART.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert+ART.h"
diff --git a/Libraries/ART/ReactNativeART.js b/Libraries/ART/ReactNativeART.js
index 4a56d0275822ee..7d9f1b59063459 100644
--- a/Libraries/ART/ReactNativeART.js
+++ b/Libraries/ART/ReactNativeART.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ReactNativeART
  */
diff --git a/Libraries/ART/ViewManagers/ARTGroupManager.h b/Libraries/ART/ViewManagers/ARTGroupManager.h
index 0a90eb3d6c18c9..a35e09481be639 100644
--- a/Libraries/ART/ViewManagers/ARTGroupManager.h
+++ b/Libraries/ART/ViewManagers/ARTGroupManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTNodeManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTGroupManager.m b/Libraries/ART/ViewManagers/ARTGroupManager.m
index 8b277641588803..2de0d0e5688739 100644
--- a/Libraries/ART/ViewManagers/ARTGroupManager.m
+++ b/Libraries/ART/ViewManagers/ARTGroupManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTGroupManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTNodeManager.h b/Libraries/ART/ViewManagers/ARTNodeManager.h
index 22f2ef166b24cf..3a8f99e7abdc7a 100644
--- a/Libraries/ART/ViewManagers/ARTNodeManager.h
+++ b/Libraries/ART/ViewManagers/ARTNodeManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/ART/ViewManagers/ARTNodeManager.m b/Libraries/ART/ViewManagers/ARTNodeManager.m
index 3c697c129783aa..8e568ce6d8efd4 100644
--- a/Libraries/ART/ViewManagers/ARTNodeManager.m
+++ b/Libraries/ART/ViewManagers/ARTNodeManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTNodeManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTRenderableManager.h b/Libraries/ART/ViewManagers/ARTRenderableManager.h
index 376fcf518b3293..1e4b554f0f79f7 100644
--- a/Libraries/ART/ViewManagers/ARTRenderableManager.h
+++ b/Libraries/ART/ViewManagers/ARTRenderableManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTNodeManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTRenderableManager.m b/Libraries/ART/ViewManagers/ARTRenderableManager.m
index aaed2e31d11179..a30841b50c1046 100644
--- a/Libraries/ART/ViewManagers/ARTRenderableManager.m
+++ b/Libraries/ART/ViewManagers/ARTRenderableManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTRenderableManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTShapeManager.h b/Libraries/ART/ViewManagers/ARTShapeManager.h
index d6bc76baa09fdb..2f31b23a0eab10 100644
--- a/Libraries/ART/ViewManagers/ARTShapeManager.h
+++ b/Libraries/ART/ViewManagers/ARTShapeManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTRenderableManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTShapeManager.m b/Libraries/ART/ViewManagers/ARTShapeManager.m
index 3997586d18e4d1..57b603ca1a16b6 100644
--- a/Libraries/ART/ViewManagers/ARTShapeManager.m
+++ b/Libraries/ART/ViewManagers/ARTShapeManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTShapeManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
index fc36435edb7707..5915536bd6f917 100644
--- a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
+++ b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m
index 10772b72c7f23d..54052a331d4585 100644
--- a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m
+++ b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTSurfaceViewManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTTextManager.h b/Libraries/ART/ViewManagers/ARTTextManager.h
index 48da9c891f4757..c7d5304da3a3eb 100644
--- a/Libraries/ART/ViewManagers/ARTTextManager.h
+++ b/Libraries/ART/ViewManagers/ARTTextManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTRenderableManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTTextManager.m b/Libraries/ART/ViewManagers/ARTTextManager.m
index 430f26db537ab1..ac6688c3d925b9 100644
--- a/Libraries/ART/ViewManagers/ARTTextManager.m
+++ b/Libraries/ART/ViewManagers/ARTTextManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTTextManager.h"
diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.js b/Libraries/ActionSheetIOS/ActionSheetIOS.js
index 9797b47b36e51c..23db7680ab34e1 100644
--- a/Libraries/ActionSheetIOS/ActionSheetIOS.js
+++ b/Libraries/ActionSheetIOS/ActionSheetIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ActionSheetIOS
  * @flow
diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.h b/Libraries/ActionSheetIOS/RCTActionSheetManager.h
index 313939149fd1a6..b9a5b2df7329a1 100644
--- a/Libraries/ActionSheetIOS/RCTActionSheetManager.h
+++ b/Libraries/ActionSheetIOS/RCTActionSheetManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.m b/Libraries/ActionSheetIOS/RCTActionSheetManager.m
index 9f550f77af32a4..91f047323769c7 100644
--- a/Libraries/ActionSheetIOS/RCTActionSheetManager.m
+++ b/Libraries/ActionSheetIOS/RCTActionSheetManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTActionSheetManager.h"
diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index 3f2e2379eeb44a..bcb51714440444 100644
--- a/Libraries/Alert/Alert.js
+++ b/Libraries/Alert/Alert.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Alert
  * @flow
@@ -30,14 +28,14 @@ type Options = {
 
 /**
  * Launches an alert dialog with the specified title and message.
- * 
+ *
  * See http://facebook.github.io/react-native/docs/alert.html
  */
 class Alert {
 
   /**
    * Launches an alert dialog with the specified title and message.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/alert.html#alert
    */
   static alert(
diff --git a/Libraries/Alert/AlertIOS.js b/Libraries/Alert/AlertIOS.js
index b42b57c29ae481..b254406462399e 100644
--- a/Libraries/Alert/AlertIOS.js
+++ b/Libraries/Alert/AlertIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AlertIOS
  * @flow
@@ -103,7 +101,7 @@ class AlertIOS {
 
   /**
    * Create and display a prompt to enter some text.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/alertios.html#prompt
    */
   static prompt(
@@ -122,11 +120,10 @@ class AlertIOS {
         'keyboardType) and the old syntax will be removed in a future version.');
 
       var callback = type;
-      var defaultValue = message;
       RCTAlertManager.alertWithArgs({
         title: title || '',
         type: 'plain-text',
-        defaultValue,
+        defaultValue: message,
       }, (id, value) => {
         callback(value);
       });
diff --git a/Libraries/Alert/RCTAlertManager.android.js b/Libraries/Alert/RCTAlertManager.android.js
index f8ad604e16da60..f819b55e1b3d1f 100644
--- a/Libraries/Alert/RCTAlertManager.android.js
+++ b/Libraries/Alert/RCTAlertManager.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTAlertManager
 */
diff --git a/Libraries/Alert/RCTAlertManager.ios.js b/Libraries/Alert/RCTAlertManager.ios.js
index 409ecf5caf0430..3aef740abed4d5 100644
--- a/Libraries/Alert/RCTAlertManager.ios.js
+++ b/Libraries/Alert/RCTAlertManager.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTAlertManager
  * @flow
diff --git a/Libraries/Animated/release/gulpfile.js b/Libraries/Animated/release/gulpfile.js
index 3d2a52c4a40405..b454ea790c2731 100644
--- a/Libraries/Animated/release/gulpfile.js
+++ b/Libraries/Animated/release/gulpfile.js
@@ -1,10 +1,8 @@
 /**
- * Copyright 2013-2015, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  * @providesModule gulpfile
  */
 
@@ -32,13 +30,10 @@ var PRODUCTION_HEADER = [
   '/**',
   ' * Animated v<%= version %>',
   ' *',
-  ' * Copyright 2013-2015, Facebook, Inc.',
-  ' * All rights reserved.',
-  ' *',
-  ' * This source code is licensed under the BSD-style license found in the',
-  ' * LICENSE file in the root directory of this source tree. An additional grant',
-  ' * of patent rights can be found in the PATENTS file in the same directory.',
+  ' * Copyright (c) 2013-present, Facebook, Inc.',
   ' *',
+  ' * This source code is licensed under the MIT license found in the',
+  ' * LICENSE file in the root directory of this source tree.',
   ' */'
 ].join('\n') + '\n';
 
diff --git a/Libraries/Animated/release/package.json b/Libraries/Animated/release/package.json
index 33654f7eae10e2..74f457a4dcd33c 100644
--- a/Libraries/Animated/release/package.json
+++ b/Libraries/Animated/release/package.json
@@ -7,7 +7,7 @@
     "animated",
     "animation"
   ],
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "main": "Animated.js",
   "dependencies": {
     "fbjs": "^0.2.1"
diff --git a/Libraries/Animated/src/Animated.js b/Libraries/Animated/src/Animated.js
index 1eacd03c48c66e..32ec9ff8046954 100644
--- a/Libraries/Animated/src/Animated.js
+++ b/Libraries/Animated/src/Animated.js
@@ -1,37 +1,30 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Animated
  * @flow
+ * @format
  */
-'use strict';
-
 
-var AnimatedImplementation = require('AnimatedImplementation');
-var Image = require('Image');
-var Text = require('Text');
-var View = require('View');
+'use strict';
 
-let AnimatedScrollView;
+const AnimatedImplementation = require('AnimatedImplementation');
+const Image = require('Image');
+const ScrollView = require('ScrollView');
+const Text = require('Text');
+const View = require('View');
 
 const Animated = {
   View: AnimatedImplementation.createAnimatedComponent(View),
   Text: AnimatedImplementation.createAnimatedComponent(Text),
   Image: AnimatedImplementation.createAnimatedComponent(Image),
-  get ScrollView() {
-    // Make this lazy to avoid circular reference.
-    if (!AnimatedScrollView) {
-      AnimatedScrollView = AnimatedImplementation.createAnimatedComponent(require('ScrollView'));
-    }
-    return AnimatedScrollView;
-  },
+  ScrollView: AnimatedImplementation.createAnimatedComponent(ScrollView),
 };
 
 Object.assign((Animated: Object), AnimatedImplementation);
 
-module.exports = ((Animated: any): (typeof AnimatedImplementation) & typeof Animated);
+module.exports = ((Animated: any): typeof AnimatedImplementation &
+  typeof Animated);
diff --git a/Libraries/Animated/src/AnimatedEvent.js b/Libraries/Animated/src/AnimatedEvent.js
index 206516f5d96a95..f9300feb4e79ea 100644
--- a/Libraries/Animated/src/AnimatedEvent.js
+++ b/Libraries/Animated/src/AnimatedEvent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedEvent
  * @flow
diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index 08d69c3bd80eca..69a96ba1d3e6ba 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedImplementation
  * @flow
@@ -41,7 +39,7 @@ import type {DecayAnimationConfig} from './animations/DecayAnimation';
 import type {SpringAnimationConfig} from './animations/SpringAnimation';
 import type {Mapping, EventConfig} from './AnimatedEvent';
 
-type CompositeAnimation = {
+export type CompositeAnimation = {
   start: (callback?: ?EndCallback) => void,
   stop: () => void,
   reset: () => void,
diff --git a/Libraries/Animated/src/AnimatedWeb.js b/Libraries/Animated/src/AnimatedWeb.js
index b88acb940bd65b..f3af397b740931 100644
--- a/Libraries/Animated/src/AnimatedWeb.js
+++ b/Libraries/Animated/src/AnimatedWeb.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AnimatedWeb
diff --git a/Libraries/Animated/src/Easing.js b/Libraries/Animated/src/Easing.js
index 6cad73c334ccbe..f5c00fd813f7dc 100644
--- a/Libraries/Animated/src/Easing.js
+++ b/Libraries/Animated/src/Easing.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Easing
  * @flow
diff --git a/Libraries/Animated/src/NativeAnimatedHelper.js b/Libraries/Animated/src/NativeAnimatedHelper.js
index 6bebbe427cb50e..5765dcfc63b829 100644
--- a/Libraries/Animated/src/NativeAnimatedHelper.js
+++ b/Libraries/Animated/src/NativeAnimatedHelper.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NativeAnimatedHelper
  * @flow
diff --git a/Libraries/Animated/src/SpringConfig.js b/Libraries/Animated/src/SpringConfig.js
index e74d167efecedc..5b476f6723469e 100644
--- a/Libraries/Animated/src/SpringConfig.js
+++ b/Libraries/Animated/src/SpringConfig.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SpringConfig
  * @flow
diff --git a/Libraries/Animated/src/__tests__/Animated-test.js b/Libraries/Animated/src/__tests__/Animated-test.js
index c8f2b94223df26..d6409d7f8a9224 100644
--- a/Libraries/Animated/src/__tests__/Animated-test.js
+++ b/Libraries/Animated/src/__tests__/Animated-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
index d3f59368ea6098..1c6700e4dc0652 100644
--- a/Libraries/Animated/src/__tests__/AnimatedNative-test.js
+++ b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
@@ -1,20 +1,22 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
 'use strict';
 
+const ClassComponentMock = class {};
+ClassComponentMock.prototype.isReactComponent = true;
+
 jest
   .clearAllMocks()
-  .setMock('Text', {})
-  .setMock('View', {})
-  .setMock('Image', {})
+  .setMock('Text', ClassComponentMock)
+  .setMock('View', ClassComponentMock)
+  .setMock('Image', ClassComponentMock)
+  .setMock('ScrollView', ClassComponentMock)
   .setMock('React', {Component: class {}})
   .setMock('NativeModules', {
     NativeAnimatedModule: {},
diff --git a/Libraries/Animated/src/__tests__/Easing-test.js b/Libraries/Animated/src/__tests__/Easing-test.js
index 048fdb711d3a49..14f18aacd628e0 100644
--- a/Libraries/Animated/src/__tests__/Easing-test.js
+++ b/Libraries/Animated/src/__tests__/Easing-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Animated/src/__tests__/Interpolation-test.js b/Libraries/Animated/src/__tests__/Interpolation-test.js
index e95365423cb09b..27f4438ab1568d 100644
--- a/Libraries/Animated/src/__tests__/Interpolation-test.js
+++ b/Libraries/Animated/src/__tests__/Interpolation-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Animated/src/animations/Animation.js b/Libraries/Animated/src/animations/Animation.js
index 90ea28196ed014..000e44d77f9bc8 100644
--- a/Libraries/Animated/src/animations/Animation.js
+++ b/Libraries/Animated/src/animations/Animation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Animation
  * @flow
diff --git a/Libraries/Animated/src/animations/DecayAnimation.js b/Libraries/Animated/src/animations/DecayAnimation.js
index 652bd9c9d3b708..7df0e104b72f48 100644
--- a/Libraries/Animated/src/animations/DecayAnimation.js
+++ b/Libraries/Animated/src/animations/DecayAnimation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DecayAnimation
  * @flow
diff --git a/Libraries/Animated/src/animations/SpringAnimation.js b/Libraries/Animated/src/animations/SpringAnimation.js
index 67dee081b81b6a..8b6f96fe67bdb6 100644
--- a/Libraries/Animated/src/animations/SpringAnimation.js
+++ b/Libraries/Animated/src/animations/SpringAnimation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SpringAnimation
  * @flow
diff --git a/Libraries/Animated/src/animations/TimingAnimation.js b/Libraries/Animated/src/animations/TimingAnimation.js
index a3db014fe1190c..1b6a4ae94cd9b0 100644
--- a/Libraries/Animated/src/animations/TimingAnimation.js
+++ b/Libraries/Animated/src/animations/TimingAnimation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimingAnimation
  * @flow
diff --git a/Libraries/Animated/src/createAnimatedComponent.js b/Libraries/Animated/src/createAnimatedComponent.js
index fd363ff0ca7495..357ee0bd59bcd1 100644
--- a/Libraries/Animated/src/createAnimatedComponent.js
+++ b/Libraries/Animated/src/createAnimatedComponent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule createAnimatedComponent
  * @flow
@@ -17,7 +15,16 @@ const AnimatedProps = require('./nodes/AnimatedProps');
 const React = require('React');
 const ViewStylePropTypes = require('ViewStylePropTypes');
 
+const invariant = require('fbjs/lib/invariant');
+
 function createAnimatedComponent(Component: any): any {
+  invariant(
+    typeof Component === 'string' ||
+      (Component.prototype && Component.prototype.isReactComponent),
+    '`createAnimatedComponent` does not support stateless functional components; ' +
+      'use a class component instead.',
+  );
+
   class AnimatedComponent extends React.Component<Object> {
     _component: any;
     _invokeAnimatedPropsCallbackOnMount: boolean = false;
diff --git a/Libraries/Animated/src/nodes/AnimatedAddition.js b/Libraries/Animated/src/nodes/AnimatedAddition.js
index 53d338836ecf8b..2e3453965565f0 100644
--- a/Libraries/Animated/src/nodes/AnimatedAddition.js
+++ b/Libraries/Animated/src/nodes/AnimatedAddition.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedAddition
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedDiffClamp.js b/Libraries/Animated/src/nodes/AnimatedDiffClamp.js
index eac26a10271b53..0f64e75c723c06 100644
--- a/Libraries/Animated/src/nodes/AnimatedDiffClamp.js
+++ b/Libraries/Animated/src/nodes/AnimatedDiffClamp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedDiffClamp
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedDivision.js b/Libraries/Animated/src/nodes/AnimatedDivision.js
index 8d658f458a5463..606e63937b9a86 100644
--- a/Libraries/Animated/src/nodes/AnimatedDivision.js
+++ b/Libraries/Animated/src/nodes/AnimatedDivision.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedDivision
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedInterpolation.js b/Libraries/Animated/src/nodes/AnimatedInterpolation.js
index 141929e5be1020..eb4cc5d6995d77 100644
--- a/Libraries/Animated/src/nodes/AnimatedInterpolation.js
+++ b/Libraries/Animated/src/nodes/AnimatedInterpolation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedInterpolation
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedModulo.js b/Libraries/Animated/src/nodes/AnimatedModulo.js
index 3ff75e737216da..24cd3f0b077c12 100644
--- a/Libraries/Animated/src/nodes/AnimatedModulo.js
+++ b/Libraries/Animated/src/nodes/AnimatedModulo.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedModulo
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedMultiplication.js b/Libraries/Animated/src/nodes/AnimatedMultiplication.js
index d30ce2594a1675..dc01f7f17127f1 100644
--- a/Libraries/Animated/src/nodes/AnimatedMultiplication.js
+++ b/Libraries/Animated/src/nodes/AnimatedMultiplication.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedMultiplication
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedNode.js b/Libraries/Animated/src/nodes/AnimatedNode.js
index c29f4b7f1a80b0..e75cfaf0e5c8fb 100644
--- a/Libraries/Animated/src/nodes/AnimatedNode.js
+++ b/Libraries/Animated/src/nodes/AnimatedNode.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedNode
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedProps.js b/Libraries/Animated/src/nodes/AnimatedProps.js
index 0b9f6508d1526d..78cd11189edfa7 100644
--- a/Libraries/Animated/src/nodes/AnimatedProps.js
+++ b/Libraries/Animated/src/nodes/AnimatedProps.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedProps
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedStyle.js b/Libraries/Animated/src/nodes/AnimatedStyle.js
index f2cdf31dfdea0a..c7bb24e3b42b14 100644
--- a/Libraries/Animated/src/nodes/AnimatedStyle.js
+++ b/Libraries/Animated/src/nodes/AnimatedStyle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedStyle
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedTracking.js b/Libraries/Animated/src/nodes/AnimatedTracking.js
index 1a54f78abb5a23..cf20d6e8bbf3fc 100644
--- a/Libraries/Animated/src/nodes/AnimatedTracking.js
+++ b/Libraries/Animated/src/nodes/AnimatedTracking.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedTracking
  * @flow
@@ -14,6 +12,10 @@
 
 const AnimatedValue = require('./AnimatedValue');
 const AnimatedNode = require('./AnimatedNode');
+const {
+  generateNewAnimationId,
+  shouldUseNativeDriver,
+} = require('../NativeAnimatedHelper');
 
 import type {EndCallback} from '../animations/Animation';
 
@@ -23,6 +25,7 @@ class AnimatedTracking extends AnimatedNode {
   _callback: ?EndCallback;
   _animationConfig: Object;
   _animationClass: any;
+  _useNativeDriver: boolean;
 
   constructor(
     value: AnimatedValue,
@@ -36,16 +39,32 @@ class AnimatedTracking extends AnimatedNode {
     this._parent = parent;
     this._animationClass = animationClass;
     this._animationConfig = animationConfig;
+    this._useNativeDriver = shouldUseNativeDriver(animationConfig);
     this._callback = callback;
     this.__attach();
   }
 
+  __makeNative() {
+    this.__isNative = true;
+    this._parent.__makeNative();
+    super.__makeNative();
+    this._value.__makeNative();
+  }
+
   __getValue(): Object {
     return this._parent.__getValue();
   }
 
   __attach(): void {
     this._parent.__addChild(this);
+    if (this._useNativeDriver) {
+      // when the tracking starts we need to convert this node to a "native node"
+      // so that the parent node will be made "native" too. This is necessary as
+      // if we don't do this `update` method will get called. At that point it
+      // may be too late as it would mean the JS driver has already started
+      // updating node values
+      this.__makeNative();
+    }
   }
 
   __detach(): void {
@@ -62,6 +81,22 @@ class AnimatedTracking extends AnimatedNode {
       this._callback,
     );
   }
+
+  __getNativeConfig(): any {
+    const animation = new this._animationClass({
+      ...this._animationConfig,
+      // remove toValue from the config as it's a ref to Animated.Value
+      toValue: undefined,
+    });
+    const animationConfig = animation.__getNativeAnimationConfig();
+    return {
+      type: 'tracking',
+      animationId: generateNewAnimationId(),
+      animationConfig,
+      toValue: this._parent.__getNativeTag(),
+      value: this._value.__getNativeTag(),
+    };
+  }
 }
 
 module.exports = AnimatedTracking;
diff --git a/Libraries/Animated/src/nodes/AnimatedTransform.js b/Libraries/Animated/src/nodes/AnimatedTransform.js
index c95aa16f699d2b..48f82f9fe3443d 100644
--- a/Libraries/Animated/src/nodes/AnimatedTransform.js
+++ b/Libraries/Animated/src/nodes/AnimatedTransform.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedTransform
  * @flow
@@ -17,9 +15,9 @@ const AnimatedWithChildren = require('./AnimatedWithChildren');
 const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 
 class AnimatedTransform extends AnimatedWithChildren {
-  _transforms: Array<Object>;
+  _transforms: $ReadOnlyArray<Object>;
 
-  constructor(transforms: Array<Object>) {
+  constructor(transforms: $ReadOnlyArray<Object>) {
     super();
     this._transforms = transforms;
   }
@@ -36,7 +34,7 @@ class AnimatedTransform extends AnimatedWithChildren {
     });
   }
 
-  __getValue(): Array<Object> {
+  __getValue(): $ReadOnlyArray<Object> {
     return this._transforms.map(transform => {
       const result = {};
       for (const key in transform) {
@@ -51,7 +49,7 @@ class AnimatedTransform extends AnimatedWithChildren {
     });
   }
 
-  __getAnimatedValue(): Array<Object> {
+  __getAnimatedValue(): $ReadOnlyArray<Object> {
     return this._transforms.map(transform => {
       const result = {};
       for (const key in transform) {
diff --git a/Libraries/Animated/src/nodes/AnimatedValue.js b/Libraries/Animated/src/nodes/AnimatedValue.js
index 49f440471e1ba3..862d25f8e53a28 100644
--- a/Libraries/Animated/src/nodes/AnimatedValue.js
+++ b/Libraries/Animated/src/nodes/AnimatedValue.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedValue
  * @flow
@@ -20,6 +18,7 @@ const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 
 import type Animation, {EndCallback} from '../animations/Animation';
 import type {InterpolationConfigType} from './AnimatedInterpolation';
+import type AnimatedTracking from './AnimatedTracking';
 
 const NativeAnimatedAPI = NativeAnimatedHelper.API;
 
@@ -76,7 +75,7 @@ class AnimatedValue extends AnimatedWithChildren {
   _startingValue: number;
   _offset: number;
   _animation: ?Animation;
-  _tracking: ?AnimatedNode;
+  _tracking: ?AnimatedTracking;
   _listeners: {[key: string]: ValueListenerCallback};
   __nativeAnimatedValueListener: ?any;
 
@@ -311,7 +310,7 @@ class AnimatedValue extends AnimatedWithChildren {
   /**
    * Typically only used internally.
    */
-  track(tracking: AnimatedNode): void {
+  track(tracking: AnimatedTracking): void {
     this.stopTracking();
     this._tracking = tracking;
   }
diff --git a/Libraries/Animated/src/nodes/AnimatedValueXY.js b/Libraries/Animated/src/nodes/AnimatedValueXY.js
index 13aee1e50d1cde..52c207c0f42ffe 100644
--- a/Libraries/Animated/src/nodes/AnimatedValueXY.js
+++ b/Libraries/Animated/src/nodes/AnimatedValueXY.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedValueXY
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedWithChildren.js b/Libraries/Animated/src/nodes/AnimatedWithChildren.js
index 4676437a9eae47..1f58cd834e165e 100644
--- a/Libraries/Animated/src/nodes/AnimatedWithChildren.js
+++ b/Libraries/Animated/src/nodes/AnimatedWithChildren.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedWithChildren
  * @flow
diff --git a/Libraries/Animated/src/polyfills/InteractionManager.js b/Libraries/Animated/src/polyfills/InteractionManager.js
index db45ede6426fd0..c063e9234b3df1 100644
--- a/Libraries/Animated/src/polyfills/InteractionManager.js
+++ b/Libraries/Animated/src/polyfills/InteractionManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/Libraries/Animated/src/polyfills/Set.js b/Libraries/Animated/src/polyfills/Set.js
index 988f0b3f13ff21..fd071410d42395 100644
--- a/Libraries/Animated/src/polyfills/Set.js
+++ b/Libraries/Animated/src/polyfills/Set.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/Libraries/Animated/src/polyfills/flattenStyle.js b/Libraries/Animated/src/polyfills/flattenStyle.js
index 42a68020c6539c..2e4c8a1d36b476 100644
--- a/Libraries/Animated/src/polyfills/flattenStyle.js
+++ b/Libraries/Animated/src/polyfills/flattenStyle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 module.exports = function(style) {
diff --git a/Libraries/AppState/AppState.js b/Libraries/AppState/AppState.js
index ebdb6d54913bb4..f2faa9480d2b57 100644
--- a/Libraries/AppState/AppState.js
+++ b/Libraries/AppState/AppState.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AppState
  * @flow
@@ -47,8 +45,8 @@ class AppState extends NativeEventEmitter {
     let eventUpdated = false;
 
     // TODO: this is a terrible solution - in order to ensure `currentState`
-    // prop is up to date, we have to register an observer that updates it 
-    // whenever the state changes, even if nobody cares. We should just 
+    // prop is up to date, we have to register an observer that updates it
+    // whenever the state changes, even if nobody cares. We should just
     // deprecate the `currentState` property and get rid of this.
     this.addListener(
       'appStateDidChange',
@@ -72,14 +70,14 @@ class AppState extends NativeEventEmitter {
   }
 
   // TODO: now that AppState is a subclass of NativeEventEmitter, we could
-  // deprecate `addEventListener` and `removeEventListener` and just use 
-  // addListener` and `listener.remove()` directly. That will be a breaking 
+  // deprecate `addEventListener` and `removeEventListener` and just use
+  // addListener` and `listener.remove()` directly. That will be a breaking
   // change though, as both the method and event names are different
   // (addListener events are currently required to be globally unique).
    /**
    * Add a handler to AppState changes by listening to the `change` event type
    * and providing the handler.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/appstate.html#addeventlistener
    */
   addEventListener(
@@ -107,7 +105,7 @@ class AppState extends NativeEventEmitter {
 
   /**
    * Remove a handler by passing the `change` event type and the handler.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/appstate.html#removeeventlistener
    */
   removeEventListener(
diff --git a/Libraries/BatchedBridge/BatchedBridge.js b/Libraries/BatchedBridge/BatchedBridge.js
index 46e8b5f41052a8..bfc6862cb83551 100644
--- a/Libraries/BatchedBridge/BatchedBridge.js
+++ b/Libraries/BatchedBridge/BatchedBridge.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BatchedBridge
  * @flow
diff --git a/Libraries/BatchedBridge/MessageQueue.js b/Libraries/BatchedBridge/MessageQueue.js
index 4309de35519cf6..428d388173989e 100644
--- a/Libraries/BatchedBridge/MessageQueue.js
+++ b/Libraries/BatchedBridge/MessageQueue.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MessageQueue
  * @flow
diff --git a/Libraries/BatchedBridge/NativeModules.js b/Libraries/BatchedBridge/NativeModules.js
index 2bf0f26c875119..324c4f6e995bdd 100644
--- a/Libraries/BatchedBridge/NativeModules.js
+++ b/Libraries/BatchedBridge/NativeModules.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NativeModules
  * @flow
diff --git a/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js b/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js
index 09ec56663b5c46..40ad81f5f5cb5f 100644
--- a/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js
+++ b/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * These don't actually exist anywhere in the code.
  */
diff --git a/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js b/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js
index 380bacf65e2c66..8c4f7d3c03063f 100644
--- a/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js
+++ b/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 'use strict';
diff --git a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
index 106821dd2fcffe..ecf60bcd0455cc 100644
--- a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
+++ b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  * @format
diff --git a/Libraries/BatchedBridge/__tests__/NativeModules-test.js b/Libraries/BatchedBridge/__tests__/NativeModules-test.js
index 88435513e72966..b9cc2411d29512 100644
--- a/Libraries/BatchedBridge/__tests__/NativeModules-test.js
+++ b/Libraries/BatchedBridge/__tests__/NativeModules-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Blob/Blob.js b/Libraries/Blob/Blob.js
index 3f077a05d71fc1..eca13a6a309e8f 100644
--- a/Libraries/Blob/Blob.js
+++ b/Libraries/Blob/Blob.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Blob
  * @flow
diff --git a/Libraries/Blob/BlobManager.js b/Libraries/Blob/BlobManager.js
index a1cf9b489e6007..dd7cc00eabc652 100644
--- a/Libraries/Blob/BlobManager.js
+++ b/Libraries/Blob/BlobManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BlobManager
  * @flow
diff --git a/Libraries/Blob/BlobRegistry.js b/Libraries/Blob/BlobRegistry.js
index 925e78f3a78453..330c1659ae4235 100644
--- a/Libraries/Blob/BlobRegistry.js
+++ b/Libraries/Blob/BlobRegistry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BlobRegistry
  * @flow
diff --git a/Libraries/Blob/BlobTypes.js b/Libraries/Blob/BlobTypes.js
index c053c08cfc8deb..8e895d9006108f 100644
--- a/Libraries/Blob/BlobTypes.js
+++ b/Libraries/Blob/BlobTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BlobTypes
  * @flow
diff --git a/Libraries/Blob/File.js b/Libraries/Blob/File.js
index 8e999b20f41dd0..f5b03d85f7f178 100644
--- a/Libraries/Blob/File.js
+++ b/Libraries/Blob/File.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule File
  * @flow
diff --git a/Libraries/Blob/FileReader.js b/Libraries/Blob/FileReader.js
index 121f7ef76caa21..b3ed89dc9318e6 100644
--- a/Libraries/Blob/FileReader.js
+++ b/Libraries/Blob/FileReader.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FileReader
  * @flow
diff --git a/Libraries/Blob/RCTBlobManager.h b/Libraries/Blob/RCTBlobManager.h
index 8e8d355f60b7ac..24b589ef987ae5 100755
--- a/Libraries/Blob/RCTBlobManager.h
+++ b/Libraries/Blob/RCTBlobManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridge.h>
diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm
index aa45072553dcbe..7c0cbb8673f064 100755
--- a/Libraries/Blob/RCTBlobManager.mm
+++ b/Libraries/Blob/RCTBlobManager.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBlobManager.h"
@@ -260,6 +258,9 @@ - (BOOL)canHandleNetworkingResponse:(NSString *)responseType
 
 - (id)handleNetworkingResponse:(NSURLResponse *)response data:(NSData *)data
 {
+  // An empty body will have nil for data, in this case we need to return
+  // an empty blob as per the XMLHttpRequest spec.
+  data = data ?: [NSData new];
   return @{
     @"blobId": [self store:data],
     @"offset": @0,
diff --git a/Libraries/Blob/RCTFileReaderModule.h b/Libraries/Blob/RCTFileReaderModule.h
index 8728c7c3dc0b67..72d224b0d968cb 100644
--- a/Libraries/Blob/RCTFileReaderModule.h
+++ b/Libraries/Blob/RCTFileReaderModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/Libraries/Blob/RCTFileReaderModule.m b/Libraries/Blob/RCTFileReaderModule.m
index debbae8cbd771b..5059e0b84180ee 100644
--- a/Libraries/Blob/RCTFileReaderModule.m
+++ b/Libraries/Blob/RCTFileReaderModule.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 
diff --git a/Libraries/Blob/URL.js b/Libraries/Blob/URL.js
index 8b761ca708ce0b..7349f7752f268c 100644
--- a/Libraries/Blob/URL.js
+++ b/Libraries/Blob/URL.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule URL
  * @format
diff --git a/Libraries/Blob/__mocks__/BlobModule.js b/Libraries/Blob/__mocks__/BlobModule.js
index 1cbda950883312..2542c3a9339adc 100644
--- a/Libraries/Blob/__mocks__/BlobModule.js
+++ b/Libraries/Blob/__mocks__/BlobModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/Libraries/Blob/__mocks__/FileReaderModule.js b/Libraries/Blob/__mocks__/FileReaderModule.js
index d4b35e00c24cc2..f5ccc39d36e200 100644
--- a/Libraries/Blob/__mocks__/FileReaderModule.js
+++ b/Libraries/Blob/__mocks__/FileReaderModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/Libraries/Blob/__tests__/Blob-test.js b/Libraries/Blob/__tests__/Blob-test.js
index 85532c819494f9..8d37915720c9b3 100644
--- a/Libraries/Blob/__tests__/Blob-test.js
+++ b/Libraries/Blob/__tests__/Blob-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+react_native
diff --git a/Libraries/Blob/__tests__/BlobManager-test.js b/Libraries/Blob/__tests__/BlobManager-test.js
index 6422861b0d2780..2ed118b446be1c 100644
--- a/Libraries/Blob/__tests__/BlobManager-test.js
+++ b/Libraries/Blob/__tests__/BlobManager-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+react_native
diff --git a/Libraries/Blob/__tests__/File-test.js b/Libraries/Blob/__tests__/File-test.js
index 99957873242ff6..c10f90c18766ae 100644
--- a/Libraries/Blob/__tests__/File-test.js
+++ b/Libraries/Blob/__tests__/File-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+react_native
@@ -15,8 +13,39 @@ jest.setMock('NativeModules', {
   BlobModule: require('../__mocks__/BlobModule'),
 });
 
+const Blob = require('Blob');
 const File = require('File');
 
+describe('babel 7 smoke test', function() {
+  it('should be able to extend a class with native name', function() {
+    let called = false;
+    class Array {
+      constructor() {
+        called = true;
+        return {foo: 'PASS'};
+      }
+    }
+    class A extends Array {
+      constructor() {
+        super();
+      }
+    }
+
+    // there is/was a regression in Babel where this would break and super()
+    // would not actually invoke the constructor of the parent class if the
+    // parent class had a name matching a built-in class (like Blob)
+    expect(new A().foo).toBe('PASS');
+    expect(called).toBe(true);
+  });
+});
+
+describe('Blob', function() {
+  it('regression caused by circular dep && babel 7', function() {
+    const blob = new Blob([], {type: 'image/jpeg'});
+    expect(blob).toBeInstanceOf(Blob);
+  });
+});
+
 describe('File', function() {
   it('should create empty file', () => {
     const file = new File([], 'test.jpg');
diff --git a/Libraries/Blob/__tests__/FileReader-test.js b/Libraries/Blob/__tests__/FileReader-test.js
index 58a0e92f6218f7..a278a4918a9d10 100644
--- a/Libraries/Blob/__tests__/FileReader-test.js
+++ b/Libraries/Blob/__tests__/FileReader-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+react_native
diff --git a/Libraries/BugReporting/BugReporting.js b/Libraries/BugReporting/BugReporting.js
index bf795899139a69..11a59e6d5222ca 100644
--- a/Libraries/BugReporting/BugReporting.js
+++ b/Libraries/BugReporting/BugReporting.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BugReporting
  * @flow
diff --git a/Libraries/BugReporting/dumpReactTree.js b/Libraries/BugReporting/dumpReactTree.js
index 88a5b7f8ffbe2e..f8a137ceff7f2c 100644
--- a/Libraries/BugReporting/dumpReactTree.js
+++ b/Libraries/BugReporting/dumpReactTree.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule dumpReactTree
  * @flow
diff --git a/Libraries/BugReporting/getReactData.js b/Libraries/BugReporting/getReactData.js
index 18f4b0888f846a..53c8fb6ccfc110 100644
--- a/Libraries/BugReporting/getReactData.js
+++ b/Libraries/BugReporting/getReactData.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule getReactData
  * @flow
diff --git a/Libraries/CameraRoll/CameraRoll.js b/Libraries/CameraRoll/CameraRoll.js
index 91fba6d8fe893c..3bc48664f35db1 100644
--- a/Libraries/CameraRoll/CameraRoll.js
+++ b/Libraries/CameraRoll/CameraRoll.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CameraRoll
  * @flow
@@ -115,8 +113,10 @@ type GetPhotosReturn = Promise<{
  * Shape of the return value of the `getPhotos` function.
  */
 const getPhotosReturnChecker = createStrictShapeTypeChecker({
-  // $FlowFixMe(>=0.41.0)
   edges: PropTypes.arrayOf(
+    /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses an
+     * error found when Flow v0.66 was deployed. To see the error delete this
+     * comment and run Flow. */
     createStrictShapeTypeChecker({
       node: createStrictShapeTypeChecker({
         type: PropTypes.string.isRequired,
diff --git a/Libraries/CameraRoll/ImagePickerIOS.js b/Libraries/CameraRoll/ImagePickerIOS.js
index a67884dc843571..24d1309d2e1b91 100644
--- a/Libraries/CameraRoll/ImagePickerIOS.js
+++ b/Libraries/CameraRoll/ImagePickerIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImagePickerIOS
  * @flow
diff --git a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h
index 405ba289aeda1d..8189bb56e4ea8c 100644
--- a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h
+++ b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridge.h>
diff --git a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m
index 30a3baf6515a09..e9637d7c4c16b5 100644
--- a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m
+++ b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAssetsLibraryRequestHandler.h"
diff --git a/Libraries/CameraRoll/RCTCameraRollManager.h b/Libraries/CameraRoll/RCTCameraRollManager.h
index f2bf18cb27cf69..b8b2c7d2ad63c7 100644
--- a/Libraries/CameraRoll/RCTCameraRollManager.h
+++ b/Libraries/CameraRoll/RCTCameraRollManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <AssetsLibrary/AssetsLibrary.h>
diff --git a/Libraries/CameraRoll/RCTCameraRollManager.m b/Libraries/CameraRoll/RCTCameraRollManager.m
index 72e128d6ecad33..b5d9a85dadb44b 100644
--- a/Libraries/CameraRoll/RCTCameraRollManager.m
+++ b/Libraries/CameraRoll/RCTCameraRollManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTCameraRollManager.h"
diff --git a/Libraries/CameraRoll/RCTImagePickerManager.h b/Libraries/CameraRoll/RCTImagePickerManager.h
index e3053f6a128cec..825e7721a46c01 100644
--- a/Libraries/CameraRoll/RCTImagePickerManager.h
+++ b/Libraries/CameraRoll/RCTImagePickerManager.h
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/CameraRoll/RCTImagePickerManager.m b/Libraries/CameraRoll/RCTImagePickerManager.m
index e851b5fca4d3c6..1ee31752f2a992 100644
--- a/Libraries/CameraRoll/RCTImagePickerManager.m
+++ b/Libraries/CameraRoll/RCTImagePickerManager.m
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h
index 67e5cfe5271ba8..0a45f184dab73c 100644
--- a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h
+++ b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTImageLoader.h>
diff --git a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m
index 0c2adb7f5206df..ac27231adc9e9a 100644
--- a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m
+++ b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPhotoLibraryImageLoader.h"
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
index 2fb4517714a588..afc4abe1533a72 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
@@ -1,40 +1,38 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AccessibilityInfo
  * @flow
  */
 'use strict';
 
-var NativeModules = require('NativeModules');
-var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
+const NativeModules = require('NativeModules');
+const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
 
-var RCTAccessibilityInfo = NativeModules.AccessibilityInfo;
+const RCTAccessibilityInfo = NativeModules.AccessibilityInfo;
 
-var TOUCH_EXPLORATION_EVENT = 'touchExplorationDidChange';
+const TOUCH_EXPLORATION_EVENT = 'touchExplorationDidChange';
 
 type ChangeEventName = $Enum<{
   change: string,
 }>;
 
-var _subscriptions = new Map();
+const _subscriptions = new Map();
 
 /**
  * Sometimes it's useful to know whether or not the device has a screen reader
  * that is currently active. The `AccessibilityInfo` API is designed for this
- * purpose. You can use it to query the current state of the screen reader as 
- * well as to register to be notified when the state of the screen reader 
+ * purpose. You can use it to query the current state of the screen reader as
+ * well as to register to be notified when the state of the screen reader
  * changes.
  *
  * See http://facebook.github.io/react-native/docs/accessibilityinfo.html
  */
 
-var AccessibilityInfo = {
+const AccessibilityInfo = {
 
   fetch: function(): Promise {
     return new Promise((resolve, reject) => {
@@ -50,7 +48,7 @@ var AccessibilityInfo = {
     eventName: ChangeEventName,
     handler: Function
   ): void {
-    var listener = RCTDeviceEventEmitter.addListener(
+    const listener = RCTDeviceEventEmitter.addListener(
       TOUCH_EXPLORATION_EVENT,
       (enabled) => {
         handler(enabled);
@@ -63,7 +61,7 @@ var AccessibilityInfo = {
     eventName: ChangeEventName,
     handler: Function
   ): void {
-    var listener = _subscriptions.get(handler);
+    const listener = _subscriptions.get(handler);
     if (!listener) {
       return;
     }
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
index fb3ce8095c0e61..6e39b5e477d5fb 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
@@ -1,49 +1,47 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AccessibilityInfo
  * @flow
  */
 'use strict';
 
-var NativeModules = require('NativeModules');
-var Promise = require('Promise');
-var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
+const NativeModules = require('NativeModules');
+const Promise = require('Promise');
+const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
 
-var AccessibilityManager = NativeModules.AccessibilityManager;
+const AccessibilityManager = NativeModules.AccessibilityManager;
 
-var VOICE_OVER_EVENT = 'voiceOverDidChange';
-var ANNOUNCEMENT_DID_FINISH_EVENT = 'announcementDidFinish';
+const VOICE_OVER_EVENT = 'voiceOverDidChange';
+const ANNOUNCEMENT_DID_FINISH_EVENT = 'announcementDidFinish';
 
 type ChangeEventName = $Enum<{
   change: string,
   announcementFinished: string
 }>;
 
-var _subscriptions = new Map();
+const _subscriptions = new Map();
 
 /**
  * Sometimes it's useful to know whether or not the device has a screen reader
  * that is currently active. The `AccessibilityInfo` API is designed for this
- * purpose. You can use it to query the current state of the screen reader as 
- * well as to register to be notified when the state of the screen reader 
+ * purpose. You can use it to query the current state of the screen reader as
+ * well as to register to be notified when the state of the screen reader
  * changes.
  *
  * See http://facebook.github.io/react-native/docs/accessibilityinfo.html
  */
-var AccessibilityInfo = {
+const AccessibilityInfo = {
 
   /**
-   * Query whether a screen reader is currently enabled. 
-   * 
-   * Returns a promise which resolves to a boolean. 
+   * Query whether a screen reader is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
    * The result is `true` when a screen reader is enabledand `false` otherwise.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#fetch
    */
   fetch: function(): Promise {
@@ -67,14 +65,14 @@ var AccessibilityInfo = {
    *     - `announcement`: The string announced by the screen reader.
    *     - `success`: A boolean indicating whether the announcement was
    *       successfully made.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#addeventlistener
    */
   addEventListener: function (
     eventName: ChangeEventName,
     handler: Function
   ): Object {
-    var listener;
+    let listener;
 
     if (eventName === 'change') {
       listener = RCTDeviceEventEmitter.addListener(
@@ -96,9 +94,9 @@ var AccessibilityInfo = {
 
   /**
    * Set accessibility focus to a react component.
-   * 
+   *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#setaccessibilityfocus
    */
   setAccessibilityFocus: function(
@@ -111,7 +109,7 @@ var AccessibilityInfo = {
    * Post a string to be announced by the screen reader.
    *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#announceforaccessibility
    */
   announceForAccessibility: function(
@@ -122,14 +120,14 @@ var AccessibilityInfo = {
 
   /**
    * Remove an event handler.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#removeeventlistener
    */
   removeEventListener: function(
     eventName: ChangeEventName,
     handler: Function
   ): void {
-    var listener = _subscriptions.get(handler);
+    const listener = _subscriptions.get(handler);
     if (!listener) {
       return;
     }
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
index 6ea90069cdb125..a520b657904738 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ActivityIndicator
  * @flow
@@ -23,6 +21,7 @@ const ViewPropTypes = require('ViewPropTypes');
 
 const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');
+let RCTActivityIndicator;
 
 const GRAY = '#999999';
 
@@ -48,20 +47,20 @@ const ActivityIndicator = createReactClass({
     ...ViewPropTypes,
     /**
      * Whether to show the indicator (true, the default) or hide it (false).
-     * 
+     *
      * See http://facebook.github.io/react-native/docs/activityindicator.html#animating
      */
     animating: PropTypes.bool,
     /**
      * The foreground color of the spinner (default is gray).
-     * 
+     *
      * See http://facebook.github.io/react-native/docs/activityindicator.html#color
      */
     color: ColorPropType,
     /**
      * Size of the indicator (default is 'small').
      * Passing a number to the size prop is only supported on Android.
-     * 
+     *
      * See http://facebook.github.io/react-native/docs/activityindicator.html#size
      */
     size: PropTypes.oneOfType([
@@ -72,7 +71,7 @@ const ActivityIndicator = createReactClass({
      * Whether the indicator should hide when not animating (true by default).
      *
      * @platform ios
-     * 
+     *
      * See http://facebook.github.io/react-native/docs/activityindicator.html#hideswhenstopped
      */
     hidesWhenStopped: PropTypes.bool,
@@ -122,6 +121,14 @@ const ActivityIndicator = createReactClass({
   }
 });
 
+if (Platform.OS === 'ios') {
+  RCTActivityIndicator = requireNativeComponent(
+    'RCTActivityIndicatorView',
+    ActivityIndicator,
+    { nativeOnly: { activityIndicatorViewStyle: true } }
+  );
+}
+
 const styles = StyleSheet.create({
   container: {
     alignItems: 'center',
@@ -137,12 +144,4 @@ const styles = StyleSheet.create({
   },
 });
 
-if (Platform.OS === 'ios') {
-  var RCTActivityIndicator = requireNativeComponent(
-    'RCTActivityIndicatorView',
-    ActivityIndicator,
-    { nativeOnly: { activityIndicatorViewStyle: true } }
-  );
-}
-
 module.exports = ActivityIndicator;
diff --git a/Libraries/Components/AppleTV/TVEventHandler.android.js b/Libraries/Components/AppleTV/TVEventHandler.android.js
deleted file mode 100644
index dc5a1d6b94e931..00000000000000
--- a/Libraries/Components/AppleTV/TVEventHandler.android.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule TVEventHandler
- * @flow
- */
-'use strict';
-
-function TVEventHandler() {}
-
-TVEventHandler.prototype.enable = function(component: ?any, callback: Function) {};
-
-TVEventHandler.prototype.disable = function() {};
-
-module.exports = TVEventHandler;
diff --git a/Libraries/Components/AppleTV/TVEventHandler.ios.js b/Libraries/Components/AppleTV/TVEventHandler.js
similarity index 76%
rename from Libraries/Components/AppleTV/TVEventHandler.ios.js
rename to Libraries/Components/AppleTV/TVEventHandler.js
index c01f2b065a76fd..363d50d903d876 100644
--- a/Libraries/Components/AppleTV/TVEventHandler.ios.js
+++ b/Libraries/Components/AppleTV/TVEventHandler.js
@@ -1,17 +1,15 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TVEventHandler
  * @flow
  */
 'use strict';
 
-const React = require('React');
+const Platform = require('Platform');
 const TVNavigationEventEmitter = require('NativeModules').TVNavigationEventEmitter;
 const NativeEventEmitter = require('NativeEventEmitter');
 
@@ -21,13 +19,13 @@ function TVEventHandler() {
 }
 
 TVEventHandler.prototype.enable = function(component: ?any, callback: Function) {
-  if (!TVNavigationEventEmitter) {
+  if (Platform.OS === 'ios' && !TVNavigationEventEmitter) {
     return;
   }
 
   this.__nativeTVNavigationEventEmitter = new NativeEventEmitter(TVNavigationEventEmitter);
   this.__nativeTVNavigationEventListener = this.__nativeTVNavigationEventEmitter.addListener(
-    'onTVNavEvent',
+    'onHWKeyEvent',
     (data) => {
       if (callback) {
         callback(component, data);
diff --git a/Libraries/Components/AppleTV/TVViewPropTypes.js b/Libraries/Components/AppleTV/TVViewPropTypes.js
index b2c426d86241e3..2b6a6d4e53dcd1 100644
--- a/Libraries/Components/AppleTV/TVViewPropTypes.js
+++ b/Libraries/Components/AppleTV/TVViewPropTypes.js
@@ -1,33 +1,27 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TVViewPropTypes
  * @flow
  */
 'use strict';
-var PropTypes = require('prop-types');
+const PropTypes = require('prop-types');
 
 /**
  * Additional View properties for Apple TV
  */
-var TVViewPropTypes = {
+const TVViewPropTypes = {
     /**
-     * *(Apple TV only)* When set to true, this view will be focusable
-     * and navigable using the Apple TV remote.
-     *
-     * @platform ios
+     * When set to true, this view will be focusable
+     * and navigable using the TV remote.
      */
     isTVSelectable: PropTypes.bool,
 
     /**
-     * *(Apple TV only)* May be set to true to force the Apple TV focus engine to move focus to this view.
-     *
-     * @platform ios
+     * May be set to true to force the TV focus engine to move focus to this view.
      */
     hasTVPreferredFocus: PropTypes.bool,
 
@@ -39,6 +33,9 @@ var TVViewPropTypes = {
      * shiftDistanceY: Defaults to 2.0.
      * tiltAngle: Defaults to 0.05.
      * magnification: Defaults to 1.0.
+     * pressMagnification: Defaults to 1.0.
+     * pressDuration: Defaults to 0.3.
+     * pressDelay: Defaults to 0.0.
      *
      * @platform ios
      */
diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
index fc3f2ef5aab3ad..4370f3571c103c 100644
--- a/Libraries/Components/Button.js
+++ b/Libraries/Components/Button.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Button
  * @flow
@@ -55,6 +53,7 @@ class Button extends React.Component<{
   title: string,
   onPress: () => any,
   color?: ?string,
+  hasTVPreferredFocus?: ?boolean,
   accessibilityLabel?: ?string,
   disabled?: ?boolean,
   testID?: ?string,
@@ -77,6 +76,10 @@ class Button extends React.Component<{
      * If true, disable all interactions for this component.
      */
     disabled: PropTypes.bool,
+    /**
+     * TV preferred focus (see documentation for the View component).
+     */
+    hasTVPreferredFocus: PropTypes.bool,
     /**
      * Handler to be called when the user taps the button
      */
@@ -85,12 +88,6 @@ class Button extends React.Component<{
      * Used to locate this view in end-to-end tests.
      */
     testID: PropTypes.string,
-    /**
-     * *(Apple TV only)* TV preferred focus (see documentation for the View component).
-     *
-     * @platform ios
-     */
-    hasTVPreferredFocus: PropTypes.bool,
   };
 
   render() {
diff --git a/Libraries/Components/CheckBox/CheckBox.android.js b/Libraries/Components/CheckBox/CheckBox.android.js
index ef1a84730b4655..e4a14c6f73dafb 100644
--- a/Libraries/Components/CheckBox/CheckBox.android.js
+++ b/Libraries/Components/CheckBox/CheckBox.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CheckBox
  * @flow
diff --git a/Libraries/Components/CheckBox/CheckBox.ios.js b/Libraries/Components/CheckBox/CheckBox.ios.js
index 02124a885a6477..386255541d47ec 100644
--- a/Libraries/Components/CheckBox/CheckBox.ios.js
+++ b/Libraries/Components/CheckBox/CheckBox.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CheckBox
  * @flow
diff --git a/Libraries/Components/Clipboard/Clipboard.js b/Libraries/Components/Clipboard/Clipboard.js
index ac8641c834701a..80d067cce257c0 100644
--- a/Libraries/Components/Clipboard/Clipboard.js
+++ b/Libraries/Components/Clipboard/Clipboard.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Clipboard
  * @flow
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.android.js b/Libraries/Components/DatePicker/DatePickerIOS.android.js
index 9a2b2669711b4b..2a0d8998bfb556 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.android.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.android.js
@@ -1,20 +1,18 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerIOS
  */
 
 'use strict';
 
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var View = require('View');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const View = require('View');
 
 class DummyDatePickerIOS extends React.Component {
   render() {
@@ -26,7 +24,7 @@ class DummyDatePickerIOS extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   dummyDatePickerIOS: {
     height: 100,
     width: 300,
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
index 88ae7d5c876d0e..b08bf8f93412bf 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerIOS
  * @flow
@@ -15,6 +13,7 @@
 
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const React = require('React');
+const invariant = require('fbjs/lib/invariant');
 const PropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
 const View = require('View');
@@ -48,7 +47,17 @@ const DatePickerIOS = createReactClass({
     /**
      * The currently selected date.
      */
-    date: PropTypes.instanceOf(Date).isRequired,
+    date: PropTypes.instanceOf(Date),
+
+    /**
+     * Provides an initial value that will change when the user starts selecting
+     * a date. It is useful for simple use-cases where you do not want to deal
+     * with listening to events and updating the date prop to keep the
+     * controlled state in sync. The controlled state has known bugs which
+     * causes it to go out of sync with native. The initialDate prop is intended
+     * to allow you to have native be source of truth.
+     */
+    initialDate: PropTypes.instanceOf(Date),
 
     /**
      * Date change handler.
@@ -104,6 +113,17 @@ const DatePickerIOS = createReactClass({
     };
   },
 
+  componentDidUpdate: function() {
+    if (this.props.date) {
+      const propsTimeStamp = this.props.date.getTime();
+      if (this._picker) {
+        this._picker.setNativeProps({
+          date: propsTimeStamp,
+        });
+      }
+    }
+  },
+
   _onChange: function(event: Event) {
     const nativeTimeStamp = event.nativeEvent.timestamp;
     this.props.onDateChange && this.props.onDateChange(
@@ -111,27 +131,20 @@ const DatePickerIOS = createReactClass({
     );
     // $FlowFixMe(>=0.41.0)
     this.props.onChange && this.props.onChange(event);
-
-    // We expect the onChange* handlers to be in charge of updating our `date`
-    // prop. That way they can also disallow/undo/mutate the selection of
-    // certain values. In other words, the embedder of this component should
-    // be the source of truth, not the native component.
-    const propsTimeStamp = this.props.date.getTime();
-    if (this._picker && nativeTimeStamp !== propsTimeStamp) {
-      this._picker.setNativeProps({
-        date: propsTimeStamp,
-      });
-    }
   },
 
   render: function() {
     const props = this.props;
+    invariant(
+      props.date || props.initialDate,
+      'A selected date or initial date should be specified.',
+    );
     return (
       <View style={props.style}>
         <RCTDatePickerIOS
           ref={ picker => { this._picker = picker; } }
           style={styles.datePickerIOS}
-          date={props.date.getTime()}
+          date={props.date ? props.date.getTime() : props.initialDate ? props.initialDate.getTime() : undefined}
           locale={props.locale ? props.locale : undefined}
           maximumDate={
             props.maximumDate ? props.maximumDate.getTime() : undefined
diff --git a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
index 11910ead0ad33c..750ed921f0684b 100644
--- a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
+++ b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerAndroid
  * @flow
diff --git a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js
index afc8a19c2e8d7d..a23602128078f8 100644
--- a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js
+++ b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerAndroid
  * @flow
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
index e75e40534ab697..6a20d894f4f4c4 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
@@ -1,37 +1,35 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DrawerLayoutAndroid
  */
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var Platform = require('Platform');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var StatusBar = require('StatusBar');
-var StyleSheet = require('StyleSheet');
-var UIManager = require('UIManager');
-var View = require('View');
-var ViewPropTypes = require('ViewPropTypes');
+const ColorPropType = require('ColorPropType');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const Platform = require('Platform');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const StatusBar = require('StatusBar');
+const StyleSheet = require('StyleSheet');
+const UIManager = require('UIManager');
+const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
-var DrawerConsts = UIManager.AndroidDrawerLayout.Constants;
+const DrawerConsts = UIManager.AndroidDrawerLayout.Constants;
 
-var createReactClass = require('create-react-class');
-var dismissKeyboard = require('dismissKeyboard');
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const dismissKeyboard = require('dismissKeyboard');
+const requireNativeComponent = require('requireNativeComponent');
 
-var RK_DRAWER_REF = 'drawerlayout';
-var INNERVIEW_REF = 'innerView';
+const RK_DRAWER_REF = 'drawerlayout';
+const INNERVIEW_REF = 'innerView';
 
-var DRAWER_STATES = [
+const DRAWER_STATES = [
   'Idle',
   'Dragging',
   'Settling',
@@ -68,7 +66,7 @@ var DRAWER_STATES = [
  * },
  * ```
  */
-var DrawerLayoutAndroid = createReactClass({
+const DrawerLayoutAndroid = createReactClass({
   displayName: 'DrawerLayoutAndroid',
   statics: {
     positions: DrawerConsts.DrawerPosition,
@@ -171,8 +169,8 @@ var DrawerLayoutAndroid = createReactClass({
   },
 
   render: function() {
-    var drawStatusBar = Platform.Version >= 21 && this.props.statusBarBackgroundColor;
-    var drawerViewWrapper =
+    const drawStatusBar = Platform.Version >= 21 && this.props.statusBarBackgroundColor;
+    const drawerViewWrapper =
       <View
         style={[
           styles.drawerSubview,
@@ -182,7 +180,7 @@ var DrawerLayoutAndroid = createReactClass({
         {this.props.renderNavigationView()}
         {drawStatusBar && <View style={styles.drawerStatusBar} />}
       </View>;
-    var childrenWrapper =
+    const childrenWrapper =
       <View ref={INNERVIEW_REF} style={styles.mainSubview} collapsable={false}>
         {drawStatusBar &&
         <StatusBar
@@ -284,7 +282,7 @@ var DrawerLayoutAndroid = createReactClass({
 
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   base: {
     flex: 1,
     elevation: 16,
@@ -315,6 +313,6 @@ var styles = StyleSheet.create({
 });
 
 // The View that contains both the actual drawer and the main view
-var AndroidDrawerLayout = requireNativeComponent('AndroidDrawerLayout', DrawerLayoutAndroid);
+const AndroidDrawerLayout = requireNativeComponent('AndroidDrawerLayout', DrawerLayoutAndroid);
 
 module.exports = DrawerLayoutAndroid;
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js
index 6c0b34e3b59108..d5b950c5b41ef0 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DrawerLayoutAndroid
  */
diff --git a/Libraries/Components/Keyboard/Keyboard.js b/Libraries/Components/Keyboard/Keyboard.js
index d85801c9d871f4..55d9891902ea7a 100644
--- a/Libraries/Components/Keyboard/Keyboard.js
+++ b/Libraries/Components/Keyboard/Keyboard.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Keyboard
  * @flow
diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
index 0ee09ea9c3086a..ffb6c58fe6379f 100644
--- a/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule KeyboardAvoidingView
  * @flow
diff --git a/Libraries/Components/LazyRenderer.js b/Libraries/Components/LazyRenderer.js
index 3f026273556e07..851bf55feee032 100644
--- a/Libraries/Components/LazyRenderer.js
+++ b/Libraries/Components/LazyRenderer.js
@@ -1,21 +1,19 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LazyRenderer
  */
 'use strict';
 
-var React = require('React');
-var createReactClass = require('create-react-class');
-var PropTypes = require('prop-types');
-var TimerMixin = require('react-timer-mixin');
+const React = require('React');
+const createReactClass = require('create-react-class');
+const PropTypes = require('prop-types');
+const TimerMixin = require('react-timer-mixin');
 
-var LazyRenderer = createReactClass({
+const LazyRenderer = createReactClass({
   displayName: 'LazyRenderer',
   mixin: [TimerMixin],
 
diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.android.js b/Libraries/Components/MaskedView/MaskedViewIOS.android.js
index 57b4be358ff63c..ad37017e1c201b 100644
--- a/Libraries/Components/MaskedView/MaskedViewIOS.android.js
+++ b/Libraries/Components/MaskedView/MaskedViewIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MaskedViewIOS
  * @flow
diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
index 85b28cb4a8b8ae..0d61728c4b29b1 100644
--- a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
+++ b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MaskedViewIOS
  * @flow
diff --git a/Libraries/Components/Navigation/NavigatorIOS.android.js b/Libraries/Components/Navigation/NavigatorIOS.android.js
index 12699e09c6a9a6..271f7ea0143fc5 100644
--- a/Libraries/Components/Navigation/NavigatorIOS.android.js
+++ b/Libraries/Components/Navigation/NavigatorIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NavigatorIOS
  */
diff --git a/Libraries/Components/Navigation/NavigatorIOS.ios.js b/Libraries/Components/Navigation/NavigatorIOS.ios.js
index 9a5596fe383bda..289680bf6fc6f3 100644
--- a/Libraries/Components/Navigation/NavigatorIOS.ios.js
+++ b/Libraries/Components/Navigation/NavigatorIOS.ios.js
@@ -1,40 +1,38 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NavigatorIOS
  * @flow
  */
 'use strict';
 
-var EventEmitter = require('EventEmitter');
-var Image = require('Image');
-var RCTNavigatorManager = require('NativeModules').NavigatorManager;
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var StaticContainer = require('StaticContainer.react');
-var StyleSheet = require('StyleSheet');
-var TVEventHandler = require('TVEventHandler');
-var View = require('View');
-var ViewPropTypes = require('ViewPropTypes');
-
-var createReactClass = require('create-react-class');
-var invariant = require('fbjs/lib/invariant');
-var requireNativeComponent = require('requireNativeComponent');
+const EventEmitter = require('EventEmitter');
+const Image = require('Image');
+const RCTNavigatorManager = require('NativeModules').NavigatorManager;
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const StaticContainer = require('StaticContainer.react');
+const StyleSheet = require('StyleSheet');
+const TVEventHandler = require('TVEventHandler');
+const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
+
+const createReactClass = require('create-react-class');
+const invariant = require('fbjs/lib/invariant');
+const requireNativeComponent = require('requireNativeComponent');
 
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
  * found when Flow v0.54 was deployed. To see the error delete this comment and
  * run Flow. */
 const keyMirror = require('fbjs/lib/keyMirror');
 
-var TRANSITIONER_REF = 'transitionerRef';
+const TRANSITIONER_REF = 'transitionerRef';
 
-var __uid = 0;
+let __uid = 0;
 function getuid() {
   return __uid++;
 }
@@ -307,7 +305,7 @@ type Event = Object;
  * is pushed.
  *
  */
-var NavigatorIOS = createReactClass({
+const NavigatorIOS = createReactClass({
   displayName: 'NavigatorIOS',
 
   propTypes: {
@@ -586,7 +584,7 @@ var NavigatorIOS = createReactClass({
 
   _getFocusEmitter: function(): EventEmitter {
     // Flow not yet tracking assignments to instance fields.
-    var focusEmitter = this._focusEmitter;
+    let focusEmitter = this._focusEmitter;
     if (!focusEmitter) {
       focusEmitter = new EventEmitter();
       this._focusEmitter = focusEmitter;
@@ -616,13 +614,13 @@ var NavigatorIOS = createReactClass({
   },
 
   _handleNavigatorStackChanged: function(e: Event) {
-    var newObservedTopOfStack = e.nativeEvent.stackLength - 1;
+    const newObservedTopOfStack = e.nativeEvent.stackLength - 1;
 
     invariant(
       newObservedTopOfStack <= this.state.requestedTopOfStack,
       'No navigator item should be pushed without JS knowing about it %s %s', newObservedTopOfStack, this.state.requestedTopOfStack
     );
-    var wasWaitingForConfirmation =
+    const wasWaitingForConfirmation =
       this.state.requestedTopOfStack !== this.state.observedTopOfStack;
     if (wasWaitingForConfirmation) {
       invariant(
@@ -640,7 +638,7 @@ var NavigatorIOS = createReactClass({
     // Progress isn't always 0 or 1 at the end, the system rounds
     // If the Navigator is offscreen these values won't be updated
     // TOOD: Revisit this decision when no longer relying on native navigator.
-    var nextState = {
+    const nextState = {
       observedTopOfStack: newObservedTopOfStack,
       makingNavigatorRequest: false,
       updatingAllIndicesAtOrBeyond: null,
@@ -655,7 +653,7 @@ var NavigatorIOS = createReactClass({
     // Updating the indices that we're deleting and that's all. (Truth: Nothing
     // even uses the indices in this case, but let's make this describe the
     // truth anyways).
-    var updatingAllIndicesAtOrBeyond =
+    const updatingAllIndicesAtOrBeyond =
       this.state.routeStack.length > this.state.observedTopOfStack + 1 ?
       this.state.observedTopOfStack + 1 :
       null;
@@ -679,8 +677,8 @@ var NavigatorIOS = createReactClass({
     if (this.state.requestedTopOfStack === this.state.observedTopOfStack) {
       this._tryLockNavigator(() => {
 
-        var nextStack = this.state.routeStack.concat([route]);
-        var nextIDStack = this.state.idStack.concat([getuid()]);
+        const nextStack = this.state.routeStack.concat([route]);
+        const nextIDStack = this.state.idStack.concat([getuid()]);
         this.setState({
           // We have to make sure that we've also supplied enough views to
           // satisfy our request to adjust the `requestedTopOfStack`.
@@ -706,7 +704,7 @@ var NavigatorIOS = createReactClass({
     if (this.state.requestedTopOfStack === this.state.observedTopOfStack) {
       if (this.state.requestedTopOfStack > 0) {
         this._tryLockNavigator(() => {
-          var newRequestedTopOfStack = this.state.requestedTopOfStack - n;
+          const newRequestedTopOfStack = this.state.requestedTopOfStack - n;
           invariant(newRequestedTopOfStack >= 0, 'Cannot pop below 0');
           this.setState({
             requestedTopOfStack: newRequestedTopOfStack,
@@ -744,8 +742,8 @@ var NavigatorIOS = createReactClass({
 
     // I don't believe we need to lock for a replace since there's no
     // navigation actually happening
-    var nextIDStack = this.state.idStack.slice();
-    var nextRouteStack = this.state.routeStack.slice();
+    const nextIDStack = this.state.idStack.slice();
+    const nextRouteStack = this.state.routeStack.slice();
     nextIDStack[index] = getuid();
     nextRouteStack[index] = route;
 
@@ -787,12 +785,12 @@ var NavigatorIOS = createReactClass({
    * @param route The new route to navigate to.
    */
   popToRoute: function(route: Route) {
-    var indexOfRoute = this.state.routeStack.indexOf(route);
+    const indexOfRoute = this.state.routeStack.indexOf(route);
     invariant(
       indexOfRoute !== -1,
       'Calling pop to route for a route that doesn\'t exist!'
     );
-    var numToPop = this.state.routeStack.length - indexOfRoute - 1;
+    const numToPop = this.state.routeStack.length - indexOfRoute - 1;
     this.popN(numToPop);
   },
 
@@ -843,12 +841,12 @@ var NavigatorIOS = createReactClass({
   },
 
   _routeToStackItem: function(routeArg: Route, i: number) {
-    var {component, wrapperStyle, passProps, ...route} = routeArg;
-    var {itemWrapperStyle, ...props} = this.props;
-    var shouldUpdateChild =
+    const {component, wrapperStyle, passProps, ...route} = routeArg;
+    const {itemWrapperStyle, ...props} = this.props;
+    const shouldUpdateChild =
       this.state.updatingAllIndicesAtOrBeyond != null &&
       this.state.updatingAllIndicesAtOrBeyond >= i;
-    var Component = component;
+    const Component = component;
     return (
       <StaticContainer key={'nav' + i} shouldUpdate={shouldUpdateChild}>
         <RCTNavigatorItem
@@ -870,12 +868,12 @@ var NavigatorIOS = createReactClass({
   },
 
   _renderNavigationStackItems: function() {
-    var shouldRecurseToNavigator =
+    const shouldRecurseToNavigator =
       this.state.makingNavigatorRequest ||
       this.state.updatingAllIndicesAtOrBeyond !== null;
     // If not recursing update to navigator at all, may as well avoid
     // computation of navigator children.
-    var items = shouldRecurseToNavigator ?
+    const items = shouldRecurseToNavigator ?
       this.state.routeStack.map(this._routeToStackItem) : null;
     return (
       <StaticContainer shouldUpdate={shouldRecurseToNavigator}>
@@ -921,7 +919,7 @@ var NavigatorIOS = createReactClass({
   },
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   stackItem: {
     backgroundColor: 'white',
     overflow: 'hidden',
@@ -936,7 +934,7 @@ var styles = StyleSheet.create({
   },
 });
 
-var RCTNavigator = requireNativeComponent('RCTNavigator');
-var RCTNavigatorItem = requireNativeComponent('RCTNavItem');
+const RCTNavigator = requireNativeComponent('RCTNavigator');
+const RCTNavigatorItem = requireNativeComponent('RCTNavItem');
 
 module.exports = NavigatorIOS;
diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js
index 443622221b624d..1df316249d7ce7 100644
--- a/Libraries/Components/Picker/Picker.js
+++ b/Libraries/Components/Picker/Picker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Picker
  * @flow
@@ -12,27 +10,27 @@
 
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var PickerIOS = require('PickerIOS');
-var PickerAndroid = require('PickerAndroid');
-var Platform = require('Platform');
-var React = require('React');
+const ColorPropType = require('ColorPropType');
+const PickerIOS = require('PickerIOS');
+const PickerAndroid = require('PickerAndroid');
+const Platform = require('Platform');
+const React = require('React');
 const PropTypes = require('prop-types');
-var StyleSheetPropType = require('StyleSheetPropType');
-var TextStylePropTypes = require('TextStylePropTypes');
-var UnimplementedView = require('UnimplementedView');
+const StyleSheetPropType = require('StyleSheetPropType');
+const TextStylePropTypes = require('TextStylePropTypes');
+const UnimplementedView = require('UnimplementedView');
 const ViewPropTypes = require('ViewPropTypes');
-var ViewStylePropTypes = require('ViewStylePropTypes');
+const ViewStylePropTypes = require('ViewStylePropTypes');
 
-var itemStylePropType = StyleSheetPropType(TextStylePropTypes);
+const itemStylePropType = StyleSheetPropType(TextStylePropTypes);
 
-var pickerStyleType = StyleSheetPropType({
+const pickerStyleType = StyleSheetPropType({
   ...ViewStylePropTypes,
   color: ColorPropType,
 });
 
-var MODE_DIALOG = 'dialog';
-var MODE_DROPDOWN = 'dropdown';
+const MODE_DIALOG = 'dialog';
+const MODE_DROPDOWN = 'dropdown';
 
 /**
  * Individual selectable item in a Picker.
diff --git a/Libraries/Components/Picker/PickerAndroid.android.js b/Libraries/Components/Picker/PickerAndroid.android.js
index 35aea2b33581b0..bd9c664a8fa5d6 100644
--- a/Libraries/Components/Picker/PickerAndroid.android.js
+++ b/Libraries/Components/Picker/PickerAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerAndroid
  * @flow
@@ -12,21 +10,21 @@
 
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var React = require('React');
-var ReactPropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var StyleSheetPropType = require('StyleSheetPropType');
+const ColorPropType = require('ColorPropType');
+const React = require('React');
+const ReactPropTypes = require('prop-types');
+const StyleSheet = require('StyleSheet');
+const StyleSheetPropType = require('StyleSheetPropType');
 const ViewPropTypes = require('ViewPropTypes');
-var ViewStylePropTypes = require('ViewStylePropTypes');
+const ViewStylePropTypes = require('ViewStylePropTypes');
 
-var processColor = require('processColor');
-var requireNativeComponent = require('requireNativeComponent');
+const processColor = require('processColor');
+const requireNativeComponent = require('requireNativeComponent');
 
-var REF_PICKER = 'picker';
-var MODE_DROPDOWN = 'dropdown';
+const REF_PICKER = 'picker';
+const MODE_DROPDOWN = 'dropdown';
 
-var pickerStyleType = StyleSheetPropType({
+const pickerStyleType = StyleSheetPropType({
   ...ViewStylePropTypes,
   color: ColorPropType,
 });
@@ -58,7 +56,7 @@ class PickerAndroid extends React.Component<{
 
   constructor(props, context) {
     super(props, context);
-    var state = this._stateFromProps(props);
+    const state = this._stateFromProps(props);
 
     this.state = {
       ...state,
@@ -72,7 +70,7 @@ class PickerAndroid extends React.Component<{
 
   // Translate prop and children into stuff that the native picker understands.
   _stateFromProps = (props) => {
-    var selectedIndex = 0;
+    let selectedIndex = 0;
     const items = React.Children.map(props.children, (child, index) => {
       if (child.props.value === props.selectedValue) {
         selectedIndex = index;
@@ -90,9 +88,9 @@ class PickerAndroid extends React.Component<{
   };
 
   render() {
-    var Picker = this.props.mode === MODE_DROPDOWN ? DropdownPicker : DialogPicker;
+    const Picker = this.props.mode === MODE_DROPDOWN ? DropdownPicker : DialogPicker;
 
-    var nativeProps = {
+    const nativeProps = {
       enabled: this.props.enabled,
       items: this.state.items,
       mode: this.props.mode,
@@ -109,10 +107,10 @@ class PickerAndroid extends React.Component<{
 
   _onChange = (event: Event) => {
     if (this.props.onValueChange) {
-      var position = event.nativeEvent.position;
+      const position = event.nativeEvent.position;
       if (position >= 0) {
-        var children = React.Children.toArray(this.props.children);
-        var value = children[position].props.value;
+        const children = React.Children.toArray(this.props.children);
+        const value = children[position].props.value;
         this.props.onValueChange(value, position);
       } else {
         this.props.onValueChange(null, position);
@@ -140,7 +138,7 @@ class PickerAndroid extends React.Component<{
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   pickerAndroid: {
     // The picker will conform to whatever width is given, but we do
     // have to set the component's height explicitly on the
@@ -151,14 +149,14 @@ var styles = StyleSheet.create({
   },
 });
 
-var cfg = {
+const cfg = {
   nativeOnly: {
     items: true,
     selected: true,
   }
 };
 
-var DropdownPicker = requireNativeComponent('AndroidDropdownPicker', PickerAndroid, cfg);
-var DialogPicker = requireNativeComponent('AndroidDialogPicker', PickerAndroid, cfg);
+const DropdownPicker = requireNativeComponent('AndroidDropdownPicker', PickerAndroid, cfg);
+const DialogPicker = requireNativeComponent('AndroidDialogPicker', PickerAndroid, cfg);
 
 module.exports = PickerAndroid;
diff --git a/Libraries/Components/Picker/PickerAndroid.ios.js b/Libraries/Components/Picker/PickerAndroid.ios.js
index fc589882864a71..b84e15bad67af0 100644
--- a/Libraries/Components/Picker/PickerAndroid.ios.js
+++ b/Libraries/Components/Picker/PickerAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerAndroid
  */
diff --git a/Libraries/Components/Picker/PickerIOS.android.js b/Libraries/Components/Picker/PickerIOS.android.js
index 7c5b39112a9ecf..ce50c2ad4e4157 100644
--- a/Libraries/Components/Picker/PickerIOS.android.js
+++ b/Libraries/Components/Picker/PickerIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerIOS
  *
diff --git a/Libraries/Components/Picker/PickerIOS.ios.js b/Libraries/Components/Picker/PickerIOS.ios.js
index 5d58c00cfc939a..d1fe0761d5cc34 100644
--- a/Libraries/Components/Picker/PickerIOS.ios.js
+++ b/Libraries/Components/Picker/PickerIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerIOS
  *
@@ -12,21 +10,21 @@
  */
 'use strict';
 
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
 const PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var StyleSheetPropType = require('StyleSheetPropType');
-var TextStylePropTypes = require('TextStylePropTypes');
-var View = require('View');
+const StyleSheet = require('StyleSheet');
+const StyleSheetPropType = require('StyleSheetPropType');
+const TextStylePropTypes = require('TextStylePropTypes');
+const View = require('View');
 const ViewPropTypes = require('ViewPropTypes');
-var processColor = require('processColor');
+const processColor = require('processColor');
 
-var createReactClass = require('create-react-class');
-var itemStylePropType = StyleSheetPropType(TextStylePropTypes);
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const itemStylePropType = StyleSheetPropType(TextStylePropTypes);
+const requireNativeComponent = require('requireNativeComponent');
 
-var PickerIOS = createReactClass({
+const PickerIOS = createReactClass({
   displayName: 'PickerIOS',
   mixins: [NativeMethodsMixin],
 
@@ -47,8 +45,8 @@ var PickerIOS = createReactClass({
 
   // Translate PickerIOS prop and children into stuff that RCTPickerIOS understands.
   _stateFromProps: function(props) {
-    var selectedIndex = 0;
-    var items = [];
+    let selectedIndex = 0;
+    const items = [];
     React.Children.toArray(props.children).forEach(function (child, index) {
       if (child.props.value === props.selectedValue) {
         selectedIndex = index;
@@ -113,7 +111,7 @@ PickerIOS.Item = class extends React.Component {
   }
 };
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   pickerIOS: {
     // The picker will conform to whatever width is given, but we do
     // have to set the component's height explicitly on the
@@ -122,7 +120,7 @@ var styles = StyleSheet.create({
   },
 });
 
-var RCTPickerIOS = requireNativeComponent('RCTPicker', {
+const RCTPickerIOS = requireNativeComponent('RCTPicker', {
   propTypes: {
     style: itemStylePropType,
   },
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
index 6f076e53dc3f0b..f5dcb10cfb9508 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressBarAndroid
  */
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js
index 99f01c81f36c20..92bae8066abe69 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressBarAndroid
  */
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
index d4a7da54aa98ec..f467db1ff51f64 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
@@ -1,21 +1,19 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressViewIOS
  */
 
 'use strict';
 
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var View = require('View');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const View = require('View');
 
 class DummyProgressViewIOS extends React.Component {
   render() {
@@ -29,7 +27,7 @@ class DummyProgressViewIOS extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   dummy: {
     width: 120,
     height: 20,
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
index e6a5485f85b30c..55ae1b83abe13d 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
@@ -1,30 +1,28 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressViewIOS
  * @flow
  */
 'use strict';
 
-var Image = require('Image');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var ViewPropTypes = require('ViewPropTypes');
+const Image = require('Image');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const PropTypes = require('prop-types');
+const StyleSheet = require('StyleSheet');
+const ViewPropTypes = require('ViewPropTypes');
 
-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
 
 /**
  * Use `ProgressViewIOS` to render a UIProgressView on iOS.
  */
-var ProgressViewIOS = createReactClass({
+const ProgressViewIOS = createReactClass({
   displayName: 'ProgressViewIOS',
   mixins: [NativeMethodsMixin],
 
@@ -71,13 +69,13 @@ var ProgressViewIOS = createReactClass({
   }
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   progressView: {
     height: 2,
   },
 });
 
-var RCTProgressView = requireNativeComponent(
+const RCTProgressView = requireNativeComponent(
   'RCTProgressView',
   ProgressViewIOS
 );
diff --git a/Libraries/Components/RefreshControl/RefreshControl.js b/Libraries/Components/RefreshControl/RefreshControl.js
index 825b8c3f2886e3..8aac1ebf3e5744 100644
--- a/Libraries/Components/RefreshControl/RefreshControl.js
+++ b/Libraries/Components/RefreshControl/RefreshControl.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RefreshControl
  * @flow
@@ -22,7 +20,11 @@ const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');
 
 if (Platform.OS === 'android') {
-  var RefreshLayoutConsts = require('UIManager').AndroidSwipeRefreshLayout.Constants;
+  const AndroidSwipeRefreshLayout =
+    require('UIManager').AndroidSwipeRefreshLayout;
+  var RefreshLayoutConsts = AndroidSwipeRefreshLayout
+    ? AndroidSwipeRefreshLayout.Constants
+    : {SIZE: {}};
 } else {
   var RefreshLayoutConsts = {SIZE: {}};
 }
diff --git a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
index cb02f672b17947..04312d5d4c5dbe 100644
--- a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
+++ b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.android.js b/Libraries/Components/SafeAreaView/SafeAreaView.android.js
index 46265995522ded..62a81a8a284352 100644
--- a/Libraries/Components/SafeAreaView/SafeAreaView.android.js
+++ b/Libraries/Components/SafeAreaView/SafeAreaView.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SafeAreaView
  * @flow
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.ios.js b/Libraries/Components/SafeAreaView/SafeAreaView.ios.js
index 73336990a7a6f6..344cbe5f301ef1 100644
--- a/Libraries/Components/SafeAreaView/SafeAreaView.ios.js
+++ b/Libraries/Components/SafeAreaView/SafeAreaView.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SafeAreaView
  * @flow
diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js
index e44f21f4fc005d..9d60c462ef1dc7 100644
--- a/Libraries/Components/ScrollResponder.js
+++ b/Libraries/Components/ScrollResponder.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ScrollResponder
  * @flow
diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index 43e89b5ab74672..5d0d007fe29f3f 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -1,17 +1,15 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ScrollView
  * @flow
  */
 'use strict';
 
-const Animated = require('Animated');
+const AnimatedImplementation = require('AnimatedImplementation');
 const ColorPropType = require('ColorPropType');
 const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const Platform = require('Platform');
@@ -499,7 +497,7 @@ const ScrollView = createReactClass({
 
   mixins: [ScrollResponder.Mixin],
 
-  _scrollAnimatedValue: (new Animated.Value(0): Animated.Value),
+  _scrollAnimatedValue: (new AnimatedImplementation.Value(0): AnimatedImplementation.Value),
   _scrollAnimatedValueAttachment: (null: ?{detach: () => void}),
   _stickyHeaderRefs: (new Map(): Map<number, ScrollViewStickyHeader>),
   _headerLayoutYs: (new Map(): Map<string, number>),
@@ -511,7 +509,7 @@ const ScrollView = createReactClass({
   },
 
   UNSAFE_componentWillMount: function() {
-    this._scrollAnimatedValue = new Animated.Value(this.props.contentOffset ? this.props.contentOffset.y : 0);
+    this._scrollAnimatedValue = new AnimatedImplementation.Value(this.props.contentOffset ? this.props.contentOffset.y : 0);
     this._scrollAnimatedValue.setOffset(this.props.contentInset ? this.props.contentInset.top : 0);
     this._stickyHeaderRefs = new Map();
     this._headerLayoutYs = new Map();
@@ -625,7 +623,7 @@ const ScrollView = createReactClass({
       this._scrollAnimatedValueAttachment.detach();
     }
     if (this.props.stickyHeaderIndices && this.props.stickyHeaderIndices.length > 0) {
-      this._scrollAnimatedValueAttachment = Animated.attachNativeEvent(
+      this._scrollAnimatedValueAttachment = AnimatedImplementation.attachNativeEvent(
         this._scrollViewRef,
         'onScroll',
         [{nativeEvent: {contentOffset: {y: this._scrollAnimatedValue}}}]
diff --git a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
index 54956acf3fee7c..af9dc9b8b63549 100644
--- a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
+++ b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ScrollViewStickyHeader
  * @flow
@@ -12,17 +10,20 @@
  */
 'use strict';
 
-const Animated = require('Animated');
+const AnimatedImplementation = require('AnimatedImplementation');
 const React = require('React');
 const StyleSheet = require('StyleSheet');
+const View = require('View');
 
 import type {LayoutEvent} from 'CoreEventTypes';
 
+const AnimatedView = AnimatedImplementation.createAnimatedComponent(View);
+
 type Props = {
   children?: React.Element<any>,
   nextHeaderLayoutY: ?number,
   onLayout: (event: LayoutEvent) => void,
-  scrollAnimatedValue: Animated.Value,
+  scrollAnimatedValue: AnimatedImplementation.Value,
   // Will cause sticky headers to stick at the bottom of the ScrollView instead
   // of the top.
   inverted: ?boolean,
@@ -138,7 +139,7 @@ class ScrollViewStickyHeader extends React.Component<Props, State> {
     const child = React.Children.only(this.props.children);
 
     return (
-      <Animated.View
+      <AnimatedView
         collapsable={false}
         onLayout={this._onLayout}
         style={[child.props.style, styles.header, {transform: [{translateY}]}]}>
@@ -146,7 +147,7 @@ class ScrollViewStickyHeader extends React.Component<Props, State> {
           style: styles.fill, // We transfer the child style to the wrapper.
           onLayout: undefined, // we call this manually through our this._onLayout
         })}
-      </Animated.View>
+      </AnimatedView>
     );
   }
 }
diff --git a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
index 6aa19b2f0eda40..eaa8bb7385e367 100644
--- a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
+++ b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/Libraries/Components/ScrollView/processDecelerationRate.js b/Libraries/Components/ScrollView/processDecelerationRate.js
index 71955a025bcfef..9cb5a52a557715 100644
--- a/Libraries/Components/ScrollView/processDecelerationRate.js
+++ b/Libraries/Components/ScrollView/processDecelerationRate.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule processDecelerationRate
  */
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
index 15ac90078588dd..a5b4c0b339bf6e 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
@@ -1,21 +1,19 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SegmentedControlIOS
  */
 
 'use strict';
 
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var View = require('View');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const View = require('View');
 
 class DummySegmentedControlIOS extends React.Component {
   render() {
@@ -29,7 +27,7 @@ class DummySegmentedControlIOS extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   dummy: {
     width: 120,
     height: 50,
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
index e5297d8f28b845..3eb4249fa2dbce 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
@@ -1,31 +1,29 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SegmentedControlIOS
  * @flow
  */
 'use strict';
 
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var ViewPropTypes = require('ViewPropTypes');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const PropTypes = require('prop-types');
+const StyleSheet = require('StyleSheet');
+const ViewPropTypes = require('ViewPropTypes');
 
-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
 
 type DefaultProps = {
   values: Array<string>,
   enabled: boolean,
 };
 
-var SEGMENTED_CONTROL_REFERENCE = 'segmentedcontrol';
+const SEGMENTED_CONTROL_REFERENCE = 'segmentedcontrol';
 
 type Event = Object;
 
@@ -49,7 +47,7 @@ type Event = Object;
  * />
  * ````
  */
-var SegmentedControlIOS = createReactClass({
+const SegmentedControlIOS = createReactClass({
   displayName: 'SegmentedControlIOS',
   mixins: [NativeMethodsMixin],
 
@@ -119,13 +117,13 @@ var SegmentedControlIOS = createReactClass({
   }
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   segmentedControl: {
     height: 28,
   },
 });
 
-var RCTSegmentedControl = requireNativeComponent(
+const RCTSegmentedControl = requireNativeComponent(
   'RCTSegmentedControl',
   SegmentedControlIOS
 );
diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js
index 91b780f7aa73a1..5a163fe176d129 100644
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -1,28 +1,26 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Slider
  * @flow
  */
 'use strict';
 
-var Image = require('Image');
-var ColorPropType = require('ColorPropType');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
-var Platform = require('Platform');
-var React = require('React');
-var PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var ViewPropTypes = require('ViewPropTypes');
+const Image = require('Image');
+const ColorPropType = require('ColorPropType');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
+const Platform = require('Platform');
+const React = require('React');
+const PropTypes = require('prop-types');
+const StyleSheet = require('StyleSheet');
+const ViewPropTypes = require('ViewPropTypes');
 
-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
 
 type Event = Object;
 
@@ -86,7 +84,7 @@ type Event = Object;
  *```
  *
  */
-var Slider = createReactClass({
+const Slider = createReactClass({
   displayName: 'Slider',
   mixins: [NativeMethodsMixin],
 
diff --git a/Libraries/Components/StaticContainer.react.js b/Libraries/Components/StaticContainer.react.js
index ee19d7d4b84431..81e06ace1fdb5f 100644
--- a/Libraries/Components/StaticContainer.react.js
+++ b/Libraries/Components/StaticContainer.react.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StaticContainer.react
  * @flow
diff --git a/Libraries/Components/StaticRenderer.js b/Libraries/Components/StaticRenderer.js
index 380a556f937b67..777fe900e120b6 100644
--- a/Libraries/Components/StaticRenderer.js
+++ b/Libraries/Components/StaticRenderer.js
@@ -1,19 +1,17 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StaticRenderer
  * @flow
  */
 'use strict';
 
-var React = require('React');
+const React = require('React');
 
-var PropTypes = require('prop-types');
+const PropTypes = require('prop-types');
 
 class StaticRenderer extends React.Component<{
   shouldUpdate: boolean,
diff --git a/Libraries/Components/StatusBar/StatusBar.js b/Libraries/Components/StatusBar/StatusBar.js
index c545b381050767..0562a315493853 100644
--- a/Libraries/Components/StatusBar/StatusBar.js
+++ b/Libraries/Components/StatusBar/StatusBar.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StatusBar
  * @flow
diff --git a/Libraries/Components/StatusBar/StatusBarIOS.android.js b/Libraries/Components/StatusBar/StatusBarIOS.android.js
index 2be8f34eaf5fb5..5c69c15339addf 100644
--- a/Libraries/Components/StatusBar/StatusBarIOS.android.js
+++ b/Libraries/Components/StatusBar/StatusBarIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StatusBarIOS
  * @flow
diff --git a/Libraries/Components/StatusBar/StatusBarIOS.ios.js b/Libraries/Components/StatusBar/StatusBarIOS.ios.js
index a3aceaac7e0988..f132f005696def 100644
--- a/Libraries/Components/StatusBar/StatusBarIOS.ios.js
+++ b/Libraries/Components/StatusBar/StatusBarIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StatusBarIOS
  * @flow
diff --git a/Libraries/Components/Subscribable.js b/Libraries/Components/Subscribable.js
index 0244ad673c2404..6825acd02f70c5 100644
--- a/Libraries/Components/Subscribable.js
+++ b/Libraries/Components/Subscribable.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Subscribable
  * @flow
@@ -21,7 +19,7 @@ import type EventEmitter from 'EventEmitter';
  * React Core
  */
 
-var Subscribable = {};
+const Subscribable = {};
 
 Subscribable.Mixin = {
 
@@ -30,7 +28,9 @@ Subscribable.Mixin = {
   },
 
   componentWillUnmount: function() {
-    this._subscribableSubscriptions.forEach(
+    // This null check is a fix for a broken version of uglify-es. Should be deleted eventually
+    // https://github.com/facebook/react-native/issues/17348
+    this._subscribableSubscriptions && this._subscribableSubscriptions.forEach(
       (subscription) => subscription.remove()
     );
     this._subscribableSubscriptions = null;
diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js
index 8ee3225f3a0ee7..e88272dacfa1d0 100644
--- a/Libraries/Components/Switch/Switch.js
+++ b/Libraries/Components/Switch/Switch.js
@@ -1,26 +1,24 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Switch
  * @flow
  */
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var Platform = require('Platform');
-var React = require('React');
+const ColorPropType = require('ColorPropType');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const Platform = require('Platform');
+const React = require('React');
 const PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
+const StyleSheet = require('StyleSheet');
 const ViewPropTypes = require('ViewPropTypes');
 
-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
 
 type DefaultProps = {
   value: boolean,
@@ -38,7 +36,7 @@ type DefaultProps = {
  * @keyword checkbox
  * @keyword toggle
  */
-var Switch = createReactClass({
+const Switch = createReactClass({
   displayName: 'Switch',
   propTypes: {
     ...ViewPropTypes,
@@ -100,7 +98,7 @@ var Switch = createReactClass({
   },
 
   render: function() {
-    var props = {...this.props};
+    const props = {...this.props};
     props.onStartShouldSetResponder = () => true;
     props.onResponderTerminationRequest = () => false;
     if (Platform.OS === 'android') {
@@ -124,7 +122,7 @@ var Switch = createReactClass({
   },
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   rctSwitchIOS: {
     height: 31,
     width: 51,
diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.android.js b/Libraries/Components/TabBarIOS/TabBarIOS.android.js
index 0c6465bb38af25..c52d947ebd325e 100644
--- a/Libraries/Components/TabBarIOS/TabBarIOS.android.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TabBarIOS
  * @flow
diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
index c373bc57ac27e8..9d1b63567ba826 100644
--- a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
@@ -1,30 +1,28 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TabBarIOS
  * @flow
  */
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var React = require('React');
+const ColorPropType = require('ColorPropType');
+const React = require('React');
 const PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var TabBarItemIOS = require('TabBarItemIOS');
+const StyleSheet = require('StyleSheet');
+const TabBarItemIOS = require('TabBarItemIOS');
 const ViewPropTypes = require('ViewPropTypes');
 
-var requireNativeComponent = require('requireNativeComponent');
+const requireNativeComponent = require('requireNativeComponent');
 
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 import type {ViewProps} from 'ViewPropTypes';
 
 class TabBarIOS extends React.Component<ViewProps & {
-  style?: StyleObj,
+  style?: DangerouslyImpreciseStyleProp,
   unselectedTintColor?: string,
   tintColor?: string,
   unselectedItemTintColor?: string,
@@ -94,12 +92,12 @@ class TabBarIOS extends React.Component<ViewProps & {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   tabGroup: {
     flex: 1,
   }
 });
 
-var RCTTabBar = requireNativeComponent('RCTTabBar', TabBarIOS);
+const RCTTabBar = requireNativeComponent('RCTTabBar', TabBarIOS);
 
 module.exports = TabBarIOS;
diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
index 43cf6d429e0bfa..ff891312c21acd 100644
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
@@ -1,19 +1,17 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TabBarItemIOS
  */
 
 'use strict';
 
-var React = require('React');
-var View = require('View');
-var StyleSheet = require('StyleSheet');
+const React = require('React');
+const View = require('View');
+const StyleSheet = require('StyleSheet');
 
 class DummyTab extends React.Component {
   render() {
@@ -28,7 +26,7 @@ class DummyTab extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   tab: {
     // TODO(5405356): Implement overflow: visible so position: absolute isn't useless
     // position: 'absolute',
diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
index d4e2687c198ff4..6b56cf78ecb86e 100644
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
@@ -1,27 +1,25 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TabBarItemIOS
  * @noflow
  */
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var Image = require('Image');
-var React = require('React');
+const ColorPropType = require('ColorPropType');
+const Image = require('Image');
+const React = require('React');
 const PropTypes = require('prop-types');
-var StaticContainer = require('StaticContainer.react');
-var StyleSheet = require('StyleSheet');
-var View = require('View');
+const StaticContainer = require('StaticContainer.react');
+const StyleSheet = require('StyleSheet');
+const View = require('View');
 
 const ViewPropTypes = require('ViewPropTypes');
 
-var requireNativeComponent = require('requireNativeComponent');
+const requireNativeComponent = require('requireNativeComponent');
 
 class TabBarItemIOS extends React.Component {
   static propTypes = {
@@ -115,7 +113,7 @@ class TabBarItemIOS extends React.Component {
   }
 
   render() {
-    var {style, children, ...props} = this.props;
+    const {style, children, ...props} = this.props;
 
     // if the tab has already been shown once, always continue to show it so we
     // preserve state between tab transitions
@@ -138,7 +136,7 @@ class TabBarItemIOS extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   tab: {
     position: 'absolute',
     top: 0,
@@ -148,6 +146,6 @@ var styles = StyleSheet.create({
   }
 });
 
-var RCTTabBarItem = requireNativeComponent('RCTTabBarItem', TabBarItemIOS);
+const RCTTabBarItem = requireNativeComponent('RCTTabBarItem', TabBarItemIOS);
 
 module.exports = TabBarItemIOS;
diff --git a/Libraries/Components/TextInput/InputAccessoryView.js b/Libraries/Components/TextInput/InputAccessoryView.js
new file mode 100644
index 00000000000000..cd12758435ff96
--- /dev/null
+++ b/Libraries/Components/TextInput/InputAccessoryView.js
@@ -0,0 +1,114 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule InputAccessoryView
+ * @flow
+ * @format
+ */
+'use strict';
+
+const ColorPropType = require('ColorPropType');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const ViewPropTypes = require('ViewPropTypes');
+
+const requireNativeComponent = require('requireNativeComponent');
+
+const RCTInputAccessoryView = requireNativeComponent('RCTInputAccessoryView');
+
+/**
+ * Note: iOS only
+ *
+ * A component which enables customization of the keyboard input accessory view.
+ * The input accessory view is displayed above the keyboard whenever a TextInput
+ * has focus. This component can be used to create custom toolbars.
+ *
+ * To use this component wrap your custom toolbar with the
+ * InputAccessoryView component, and set a nativeID. Then, pass that nativeID
+ * as the inputAccessoryViewID of whatever TextInput you desire. A simple
+ * example:
+ *
+ * ```ReactNativeWebPlayer
+ * import React, { Component } from 'react';
+ * import { AppRegistry, TextInput, InputAccessoryView, Button } from 'react-native';
+ *
+ * export default class UselessTextInput extends Component {
+ *   constructor(props) {
+ *     super(props);
+ *     this.state = {text: 'Placeholder Text'};
+ *   }
+ *
+ *   render() {
+ *     const inputAccessoryViewID = "uniqueID";
+ *     return (
+ *       <View>
+ *         <ScrollView keyboardDismissMode="interactive">
+ *           <TextInput
+ *             style={{
+ *               padding: 10,
+ *               paddingTop: 50,
+ *             }}
+ *             inputAccessoryViewID=inputAccessoryViewID
+ *             onChangeText={text => this.setState({text})}
+ *             value={this.state.text}
+ *           />
+ *         </ScrollView>
+ *         <InputAccessoryView nativeID=inputAccessoryViewID>
+ *           <Button
+ *             onPress={() => this.setState({text: 'Placeholder Text'})}
+ *             title="Reset Text"
+ *           />
+ *         </InputAccessoryView>
+ *       </View>
+ *     );
+ *   }
+ * }
+ *
+ * // skip this line if using Create React Native App
+ * AppRegistry.registerComponent('AwesomeProject', () => UselessTextInput);
+ * ```
+ *
+ * This component can also be used to create sticky text inputs (text inputs
+ * which are anchored to the top of the keyboard). To do this, wrap a
+ * TextInput with the InputAccessoryView component, and don't set a nativeID.
+ * For an example, look at InputAccessoryViewExample.js in RNTester.
+ */
+
+type Props = {
+  +children: React.Node,
+  /**
+   * An ID which is used to associate this `InputAccessoryView` to
+   * specified TextInput(s).
+   */
+  nativeID?: string,
+  style?: ViewPropTypes.style,
+  backgroundColor?: ColorPropType,
+};
+
+class InputAccessoryView extends React.Component<Props> {
+  render(): React.Node {
+    if (React.Children.count(this.props.children) === 0) {
+      return null;
+    }
+
+    return (
+      <RCTInputAccessoryView
+        style={[this.props.style, styles.container]}
+        nativeID={this.props.nativeID}
+        backgroundColor={this.props.backgroundColor}>
+        {this.props.children}
+      </RCTInputAccessoryView>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    position: 'absolute',
+  },
+});
+
+module.exports = InputAccessoryView;
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 47e6bc4fc08045..deb3b40e48bdee 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextInput
  * @flow
@@ -33,9 +31,6 @@ const UIManager = require('UIManager');
 const ViewPropTypes = require('ViewPropTypes');
 const {ViewContextTypes} = require('ViewContext');
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const emptyFunction = require('fbjs/lib/emptyFunction');
 const invariant = require('fbjs/lib/invariant');
 const requireNativeComponent = require('requireNativeComponent');
@@ -44,6 +39,10 @@ const requireNativeComponent = require('requireNativeComponent');
  * run Flow. */
 const warning = require('fbjs/lib/warning');
 
+let AndroidTextInput;
+let RCTMultilineTextInputView;
+let RCTSinglelineTextInputView;
+
 const onlyMultiline = {
   onTextInput: true,
   children: true,
@@ -52,13 +51,13 @@ const onlyMultiline = {
 import type {ViewChildContext} from 'ViewContext';
 
 if (Platform.OS === 'android') {
-  var AndroidTextInput = requireNativeComponent('AndroidTextInput', null);
+  AndroidTextInput = requireNativeComponent('AndroidTextInput', null);
 } else if (Platform.OS === 'ios') {
-  var RCTMultilineTextInputView = requireNativeComponent(
+  RCTMultilineTextInputView = requireNativeComponent(
     'RCTMultilineTextInputView',
     null,
   );
-  var RCTSinglelineTextInputView = requireNativeComponent(
+  RCTSinglelineTextInputView = requireNativeComponent(
     'RCTSinglelineTextInputView',
     null,
   );
@@ -595,6 +594,17 @@ const TextInput = createReactClass({
      * This property is supported only for single-line TextInput component on iOS.
      */
     caretHidden: PropTypes.bool,
+    /*
+     * If `true`, contextMenuHidden is hidden. The default value is `false`.
+     */
+    contextMenuHidden: PropTypes.bool,
+    /**
+     * An optional identifier which links a custom InputAccessoryView to
+     * this text input. The InputAccessoryView is rendered above the
+     * keyboard when this text input is focused.
+     * @platform ios
+     */
+    inputAccessoryViewID: PropTypes.string,
   },
   getDefaultProps(): Object {
     return {
@@ -696,9 +706,9 @@ const TextInput = createReactClass({
   },
 
   _renderIOSLegacy: function() {
-    var textContainer;
+    let textContainer;
 
-    var props = Object.assign({}, this.props);
+    const props = Object.assign({}, this.props);
     props.style = [this.props.style];
 
     if (props.selection && props.selection.end == null) {
@@ -710,7 +720,7 @@ const TextInput = createReactClass({
 
     if (!props.multiline) {
       if (__DEV__) {
-        for (var propKey in onlyMultiline) {
+        for (const propKey in onlyMultiline) {
           if (props[propKey]) {
             const error = new Error(
               'TextInput prop `' +
@@ -734,8 +744,8 @@ const TextInput = createReactClass({
         />
       );
     } else {
-      var children = props.children;
-      var childCount = 0;
+      let children = props.children;
+      let childCount = 0;
       React.Children.forEach(children, () => ++childCount);
       invariant(
         !(props.value && childCount),
@@ -787,7 +797,7 @@ const TextInput = createReactClass({
   },
 
   _renderIOS: function() {
-    var props = Object.assign({}, this.props);
+    const props = Object.assign({}, this.props);
     props.style = [this.props.style];
 
     if (props.selection && props.selection.end == null) {
@@ -847,8 +857,8 @@ const TextInput = createReactClass({
     /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
      * suppresses an error when upgrading Flow's support for React. To see the
      * error delete this comment and run Flow. */
-    var children = this.props.children;
-    var childCount = 0;
+    let children = this.props.children;
+    let childCount = 0;
     React.Children.forEach(children, () => ++childCount);
     invariant(
       !(this.props.value && childCount),
@@ -885,7 +895,7 @@ const TextInput = createReactClass({
 
     return (
       <TouchableWithoutFeedback
-        onLayout={this._onLayout}
+        onLayout={props.onLayout}
         onPress={this._onPress}
         accessible={this.props.accessible}
         accessibilityLabel={this.props.accessibilityLabel}
@@ -922,7 +932,7 @@ const TextInput = createReactClass({
       });
     }
 
-    var text = event.nativeEvent.text;
+    const text = event.nativeEvent.text;
     this.props.onChange && this.props.onChange(event);
     this.props.onChangeText && this.props.onChangeText(text);
 
@@ -1006,7 +1016,7 @@ const TextInput = createReactClass({
   },
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   multilineInput: {
     // This default top inset makes RCTMultilineTextInputView seem as close as possible
     // to single-line RCTSinglelineTextInputView defaults, using the system defaults
diff --git a/Libraries/Components/TextInput/TextInputState.js b/Libraries/Components/TextInput/TextInputState.js
index 7d17fe639352d6..afcca82bf320f3 100644
--- a/Libraries/Components/TextInput/TextInputState.js
+++ b/Libraries/Components/TextInput/TextInputState.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextInputState
  * @flow
@@ -15,10 +13,10 @@
  */
 'use strict';
 
-var Platform = require('Platform');
-var UIManager = require('UIManager');
+const Platform = require('Platform');
+const UIManager = require('UIManager');
 
-var TextInputState = {
+const TextInputState = {
    /**
    * Internal state
    */
diff --git a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js
index e837075ded13b4..be7f4c4f9286c6 100644
--- a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js
+++ b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimePickerAndroid
  * @flow
diff --git a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js
index 1214d231ca6754..a6b630d7c394a4 100644
--- a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js
+++ b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimePickerAndroid
  * @flow
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.android.js b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
index 2555b83b4daa4e..15a8a597a5b686 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.android.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ToastAndroid
  * @flow
@@ -12,7 +10,7 @@
 
 'use strict';
 
-var RCTToastAndroid = require('NativeModules').ToastAndroid;
+const RCTToastAndroid = require('NativeModules').ToastAndroid;
 
 /**
  * This exposes the native ToastAndroid module as a JS module. This has a function 'show'
@@ -35,7 +33,7 @@ var RCTToastAndroid = require('NativeModules').ToastAndroid;
  * ```
  */
 
-var ToastAndroid = {
+const ToastAndroid = {
 
   // Toast duration constants
   SHORT: RCTToastAndroid.SHORT,
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.ios.js b/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
index 4fc912777abb2f..83db0cfa82cae4 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
@@ -1,19 +1,17 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ToastAndroid
  * @noflow
  */
 'use strict';
 
-var warning = require('fbjs/lib/warning');
+const warning = require('fbjs/lib/warning');
 
-var ToastAndroid = {
+const ToastAndroid = {
 
   show: function (
     message: string,
diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
index 85435eaea6bfa4..1d845e5b65bacf 100644
--- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
+++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
@@ -1,30 +1,28 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ToolbarAndroid
  */
 
 'use strict';
 
-var Image = require('Image');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
-var UIManager = require('UIManager');
-var ViewPropTypes = require('ViewPropTypes');
-var ColorPropType = require('ColorPropType');
+const Image = require('Image');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
+const UIManager = require('UIManager');
+const ViewPropTypes = require('ViewPropTypes');
+const ColorPropType = require('ColorPropType');
 
-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
-var resolveAssetSource = require('resolveAssetSource');
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
+const resolveAssetSource = require('resolveAssetSource');
 
-var optionalImageSource = PropTypes.oneOfType([
+const optionalImageSource = PropTypes.oneOfType([
   Image.propTypes.source,
   // Image.propTypes.source is required but we want it to be optional, so we OR
   // it with a nullable propType.
@@ -66,7 +64,7 @@ var optionalImageSource = PropTypes.oneOfType([
  *
  * [0]: https://developer.android.com/reference/android/support/v7/widget/Toolbar.html
  */
-var ToolbarAndroid = createReactClass({
+const ToolbarAndroid = createReactClass({
   displayName: 'ToolbarAndroid',
   mixins: [NativeMethodsMixin],
 
@@ -164,7 +162,7 @@ var ToolbarAndroid = createReactClass({
   },
 
   render: function() {
-    var nativeProps = {
+    const nativeProps = {
       ...this.props,
     };
     if (this.props.logo) {
@@ -177,9 +175,9 @@ var ToolbarAndroid = createReactClass({
       nativeProps.overflowIcon = resolveAssetSource(this.props.overflowIcon);
     }
     if (this.props.actions) {
-      var nativeActions = [];
-      for (var i = 0; i < this.props.actions.length; i++) {
-        var action = {
+      const nativeActions = [];
+      for (let i = 0; i < this.props.actions.length; i++) {
+        const action = {
           ...this.props.actions[i],
         };
         if (action.icon) {
@@ -197,7 +195,7 @@ var ToolbarAndroid = createReactClass({
   },
 
   _onSelect: function(event) {
-    var position = event.nativeEvent.position;
+    const position = event.nativeEvent.position;
     if (position === -1) {
       this.props.onIconClicked && this.props.onIconClicked();
     } else {
@@ -206,7 +204,7 @@ var ToolbarAndroid = createReactClass({
   },
 });
 
-var NativeToolbar = requireNativeComponent('ToolbarAndroid', ToolbarAndroid, {
+const NativeToolbar = requireNativeComponent('ToolbarAndroid', ToolbarAndroid, {
   nativeOnly: {
     nativeActions: true,
   }
diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js
index 28a8901ff890fd..68ef4ef8300aba 100644
--- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js
+++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ToolbarAndroid
  */
diff --git a/Libraries/Components/Touchable/BoundingDimensions.js b/Libraries/Components/Touchable/BoundingDimensions.js
index a5877717b6b651..9bc78e515d8ef3 100644
--- a/Libraries/Components/Touchable/BoundingDimensions.js
+++ b/Libraries/Components/Touchable/BoundingDimensions.js
@@ -1,19 +1,17 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BoundingDimensions
  */
 
 'use strict';
 
-var PooledClass = require('PooledClass');
+const PooledClass = require('PooledClass');
 
-var twoArgumentPooler = PooledClass.twoArgumentPooler;
+const twoArgumentPooler = PooledClass.twoArgumentPooler;
 
 /**
  * PooledClass representing the bounding rectangle of a region.
diff --git a/Libraries/Components/Touchable/PooledClass.js b/Libraries/Components/Touchable/PooledClass.js
index ad5d874baa9c03..a3ae190aa3d22f 100644
--- a/Libraries/Components/Touchable/PooledClass.js
+++ b/Libraries/Components/Touchable/PooledClass.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-var invariant = require('fbjs/lib/invariant');
+const invariant = require('fbjs/lib/invariant');
 
 /**
  * Static poolers. Several custom versions for each potential number of
@@ -19,10 +19,10 @@ var invariant = require('fbjs/lib/invariant');
  * the Class itself, not an instance. If any others are needed, simply add them
  * here, or in their own files.
  */
-var oneArgumentPooler = function(copyFieldsFrom) {
-  var Klass = this;
+const oneArgumentPooler = function(copyFieldsFrom) {
+  const Klass = this;
   if (Klass.instancePool.length) {
-    var instance = Klass.instancePool.pop();
+    const instance = Klass.instancePool.pop();
     Klass.call(instance, copyFieldsFrom);
     return instance;
   } else {
@@ -30,10 +30,10 @@ var oneArgumentPooler = function(copyFieldsFrom) {
   }
 };
 
-var twoArgumentPooler = function(a1, a2) {
-  var Klass = this;
+const twoArgumentPooler = function(a1, a2) {
+  const Klass = this;
   if (Klass.instancePool.length) {
-    var instance = Klass.instancePool.pop();
+    const instance = Klass.instancePool.pop();
     Klass.call(instance, a1, a2);
     return instance;
   } else {
@@ -41,10 +41,10 @@ var twoArgumentPooler = function(a1, a2) {
   }
 };
 
-var threeArgumentPooler = function(a1, a2, a3) {
-  var Klass = this;
+const threeArgumentPooler = function(a1, a2, a3) {
+  const Klass = this;
   if (Klass.instancePool.length) {
-    var instance = Klass.instancePool.pop();
+    const instance = Klass.instancePool.pop();
     Klass.call(instance, a1, a2, a3);
     return instance;
   } else {
@@ -52,10 +52,10 @@ var threeArgumentPooler = function(a1, a2, a3) {
   }
 };
 
-var fourArgumentPooler = function(a1, a2, a3, a4) {
-  var Klass = this;
+const fourArgumentPooler = function(a1, a2, a3, a4) {
+  const Klass = this;
   if (Klass.instancePool.length) {
-    var instance = Klass.instancePool.pop();
+    const instance = Klass.instancePool.pop();
     Klass.call(instance, a1, a2, a3, a4);
     return instance;
   } else {
@@ -63,8 +63,8 @@ var fourArgumentPooler = function(a1, a2, a3, a4) {
   }
 };
 
-var standardReleaser = function(instance) {
-  var Klass = this;
+const standardReleaser = function(instance) {
+  const Klass = this;
   invariant(
     instance instanceof Klass,
     'Trying to release an instance into a pool of a different type.',
@@ -75,8 +75,8 @@ var standardReleaser = function(instance) {
   }
 };
 
-var DEFAULT_POOL_SIZE = 10;
-var DEFAULT_POOLER = oneArgumentPooler;
+const DEFAULT_POOL_SIZE = 10;
+const DEFAULT_POOLER = oneArgumentPooler;
 
 type Pooler = any;
 
@@ -89,7 +89,7 @@ type Pooler = any;
  * @param {Function} CopyConstructor Constructor that can be used to reset.
  * @param {Function} pooler Customizable pooler.
  */
-var addPoolingTo = function<T>(
+const addPoolingTo = function<T>(
   CopyConstructor: Class<T>,
   pooler: Pooler,
 ): Class<T> & {
@@ -100,7 +100,7 @@ var addPoolingTo = function<T>(
 } {
   // Casting as any so that flow ignores the actual implementation and trusts
   // it to match the type we declared
-  var NewKlass = (CopyConstructor: any);
+  const NewKlass = (CopyConstructor: any);
   NewKlass.instancePool = [];
   NewKlass.getPooled = pooler || DEFAULT_POOLER;
   if (!NewKlass.poolSize) {
@@ -110,7 +110,7 @@ var addPoolingTo = function<T>(
   return NewKlass;
 };
 
-var PooledClass = {
+const PooledClass = {
   addPoolingTo: addPoolingTo,
   oneArgumentPooler: (oneArgumentPooler: Pooler),
   twoArgumentPooler: (twoArgumentPooler: Pooler),
diff --git a/Libraries/Components/Touchable/Position.js b/Libraries/Components/Touchable/Position.js
index 77dd3ad11b81e9..572d1132f038bc 100644
--- a/Libraries/Components/Touchable/Position.js
+++ b/Libraries/Components/Touchable/Position.js
@@ -1,19 +1,17 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Position
  */
 
 'use strict';
 
-var PooledClass = require('PooledClass');
+const PooledClass = require('PooledClass');
 
-var twoArgumentPooler = PooledClass.twoArgumentPooler;
+const twoArgumentPooler = PooledClass.twoArgumentPooler;
 
 /**
  * Position does not expose methods for construction via an `HTMLDOMElement`,
diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js
index e8f925e90d5b11..00a82cd64ac6e6 100644
--- a/Libraries/Components/Touchable/Touchable.js
+++ b/Libraries/Components/Touchable/Touchable.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Touchable
  */
@@ -112,7 +110,7 @@ const normalizeColor = require('normalizeColor');
 /**
  * Touchable states.
  */
-var States = keyMirror({
+const States = keyMirror({
   NOT_RESPONDER: null,                   // Not the responder
   RESPONDER_INACTIVE_PRESS_IN: null,     // Responder, inactive, in the `PressRect`
   RESPONDER_INACTIVE_PRESS_OUT: null,    // Responder, inactive, out of `PressRect`
@@ -126,7 +124,7 @@ var States = keyMirror({
 /**
  * Quick lookup map for states that are considered to be "active"
  */
-var IsActive = {
+const IsActive = {
   RESPONDER_ACTIVE_PRESS_OUT: true,
   RESPONDER_ACTIVE_PRESS_IN: true
 };
@@ -135,20 +133,20 @@ var IsActive = {
  * Quick lookup for states that are considered to be "pressing" and are
  * therefore eligible to result in a "selection" if the press stops.
  */
-var IsPressingIn = {
+const IsPressingIn = {
   RESPONDER_INACTIVE_PRESS_IN: true,
   RESPONDER_ACTIVE_PRESS_IN: true,
   RESPONDER_ACTIVE_LONG_PRESS_IN: true,
 };
 
-var IsLongPressingIn = {
+const IsLongPressingIn = {
   RESPONDER_ACTIVE_LONG_PRESS_IN: true,
 };
 
 /**
  * Inputs to the state machine.
  */
-var Signals = keyMirror({
+const Signals = keyMirror({
   DELAY: null,
   RESPONDER_GRANT: null,
   RESPONDER_RELEASE: null,
@@ -161,7 +159,7 @@ var Signals = keyMirror({
 /**
  * Mapping from States x Signals => States
  */
-var Transitions = {
+const Transitions = {
   NOT_RESPONDER: {
     DELAY: States.ERROR,
     RESPONDER_GRANT: States.RESPONDER_INACTIVE_PRESS_IN,
@@ -239,15 +237,15 @@ var Transitions = {
 // ==== Typical Constants for integrating into UI components ====
 // var HIT_EXPAND_PX = 20;
 // var HIT_VERT_OFFSET_PX = 10;
-var HIGHLIGHT_DELAY_MS = 130;
+const HIGHLIGHT_DELAY_MS = 130;
 
-var PRESS_EXPAND_PX = 20;
+const PRESS_EXPAND_PX = 20;
 
-var LONG_PRESS_THRESHOLD = 500;
+const LONG_PRESS_THRESHOLD = 500;
 
-var LONG_PRESS_DELAY_MS = LONG_PRESS_THRESHOLD - HIGHLIGHT_DELAY_MS;
+const LONG_PRESS_DELAY_MS = LONG_PRESS_THRESHOLD - HIGHLIGHT_DELAY_MS;
 
-var LONG_PRESS_ALLOWED_MOVEMENT = 10;
+const LONG_PRESS_ALLOWED_MOVEMENT = 10;
 
 // Default amount "active" region protrudes beyond box
 
@@ -315,15 +313,15 @@ var LONG_PRESS_ALLOWED_MOVEMENT = 10;
  *
  * @lends Touchable.prototype
  */
-var TouchableMixin = {
+const TouchableMixin = {
   componentDidMount: function() {
-    if (!Platform.isTVOS) {
+    if (!Platform.isTV) {
       return;
     }
 
     this._tvEventHandler = new TVEventHandler();
     this._tvEventHandler.enable(this, function(cmp, evt) {
-      var myTag = ReactNative.findNodeHandle(cmp);
+      const myTag = ReactNative.findNodeHandle(cmp);
       evt.dispatchConfig = {};
       if (myTag === evt.tag) {
         if (evt.eventType === 'focus') {
@@ -331,7 +329,7 @@ var TouchableMixin = {
         } else if (evt.eventType === 'blur') {
           cmp.touchableHandleActivePressOut && cmp.touchableHandleActivePressOut(evt);
         } else if (evt.eventType === 'select') {
-          cmp.touchableHandlePress && cmp.touchableHandlePress(evt);
+          cmp.touchableHandlePress && !cmp.props.disabled && cmp.touchableHandlePress(evt);
         }
       }
     });
@@ -391,7 +389,7 @@ var TouchableMixin = {
    *
    */
   touchableHandleResponderGrant: function(e) {
-    var dispatchID = e.currentTarget;
+    const dispatchID = e.currentTarget;
     // Since e is used in a callback invoked on another event loop
     // (as in setTimeout etc), we need to call e.persist() on the
     // event to make sure it doesn't get reused in the event object pool.
@@ -403,7 +401,7 @@ var TouchableMixin = {
     this.state.touchable.touchState = States.NOT_RESPONDER;
     this.state.touchable.responderID = dispatchID;
     this._receiveSignal(Signals.RESPONDER_GRANT, e);
-    var delayMS =
+    let delayMS =
       this.touchableGetHighlightDelayMS !== undefined ?
       Math.max(this.touchableGetHighlightDelayMS(), 0) : HIGHLIGHT_DELAY_MS;
     delayMS = isNaN(delayMS) ? HIGHLIGHT_DELAY_MS : delayMS;
@@ -416,7 +414,7 @@ var TouchableMixin = {
       this._handleDelay(e);
     }
 
-    var longDelayMS =
+    let longDelayMS =
       this.touchableGetLongPressDelayMS !== undefined ?
       Math.max(this.touchableGetLongPressDelayMS(), 10) : LONG_PRESS_DELAY_MS;
     longDelayMS = isNaN(longDelayMS) ? LONG_PRESS_DELAY_MS : longDelayMS;
@@ -455,9 +453,9 @@ var TouchableMixin = {
       return;
     }
 
-    var positionOnActivate = this.state.touchable.positionOnActivate;
-    var dimensionsOnActivate = this.state.touchable.dimensionsOnActivate;
-    var pressRectOffset = this.touchableGetPressRectOffset ?
+    const positionOnActivate = this.state.touchable.positionOnActivate;
+    const dimensionsOnActivate = this.state.touchable.dimensionsOnActivate;
+    const pressRectOffset = this.touchableGetPressRectOffset ?
       this.touchableGetPressRectOffset() : {
         left: PRESS_EXPAND_PX,
         right: PRESS_EXPAND_PX,
@@ -465,12 +463,12 @@ var TouchableMixin = {
         bottom: PRESS_EXPAND_PX
       };
 
-    var pressExpandLeft = pressRectOffset.left;
-    var pressExpandTop = pressRectOffset.top;
-    var pressExpandRight = pressRectOffset.right;
-    var pressExpandBottom = pressRectOffset.bottom;
+    let pressExpandLeft = pressRectOffset.left;
+    let pressExpandTop = pressRectOffset.top;
+    let pressExpandRight = pressRectOffset.right;
+    let pressExpandBottom = pressRectOffset.bottom;
 
-    var hitSlop = this.touchableGetHitSlop ?
+    const hitSlop = this.touchableGetHitSlop ?
       this.touchableGetHitSlop() : null;
 
     if (hitSlop) {
@@ -480,18 +478,18 @@ var TouchableMixin = {
       pressExpandBottom += hitSlop.bottom;
     }
 
-    var touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
-    var pageX = touch && touch.pageX;
-    var pageY = touch && touch.pageY;
+    const touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
+    const pageX = touch && touch.pageX;
+    const pageY = touch && touch.pageY;
 
     if (this.pressInLocation) {
-      var movedDistance = this._getDistanceBetweenPoints(pageX, pageY, this.pressInLocation.pageX, this.pressInLocation.pageY);
+      const movedDistance = this._getDistanceBetweenPoints(pageX, pageY, this.pressInLocation.pageX, this.pressInLocation.pageY);
       if (movedDistance > LONG_PRESS_ALLOWED_MOVEMENT) {
         this._cancelLongPressDelayTimeout();
       }
     }
 
-    var isTouchWithinActive =
+    const isTouchWithinActive =
         pageX > positionOnActivate.left - pressExpandLeft &&
         pageY > positionOnActivate.top - pressExpandTop &&
         pageX <
@@ -504,7 +502,7 @@ var TouchableMixin = {
           pressExpandBottom;
     if (isTouchWithinActive) {
       this._receiveSignal(Signals.ENTER_PRESS_RECT, e);
-      var curState = this.state.touchable.touchState;
+      const curState = this.state.touchable.touchState;
       if (curState === States.RESPONDER_INACTIVE_PRESS_IN) {
         // fix for t7967420
         this._cancelLongPressDelayTimeout();
@@ -622,7 +620,7 @@ var TouchableMixin = {
 
   _handleLongDelay: function(e) {
     this.longPressDelayTimeout = null;
-    var curState = this.state.touchable.touchState;
+    const curState = this.state.touchable.touchState;
     if (curState !== States.RESPONDER_ACTIVE_PRESS_IN &&
         curState !== States.RESPONDER_ACTIVE_LONG_PRESS_IN) {
       console.error('Attempted to transition from state `' + curState + '` to `' +
@@ -642,9 +640,9 @@ var TouchableMixin = {
    * @sideeffects
    */
   _receiveSignal: function(signal, e) {
-    var responderID = this.state.touchable.responderID;
-    var curState = this.state.touchable.touchState;
-    var nextState = Transitions[curState] && Transitions[curState][signal];
+    const responderID = this.state.touchable.responderID;
+    const curState = this.state.touchable.touchState;
+    const nextState = Transitions[curState] && Transitions[curState][signal];
     if (!responderID && signal === Signals.RESPONDER_RELEASE) {
       return;
     }
@@ -677,17 +675,17 @@ var TouchableMixin = {
   },
 
   _savePressInLocation: function(e) {
-    var touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
-    var pageX = touch && touch.pageX;
-    var pageY = touch && touch.pageY;
-    var locationX = touch && touch.locationX;
-    var locationY = touch && touch.locationY;
+    const touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
+    const pageX = touch && touch.pageX;
+    const pageY = touch && touch.pageY;
+    const locationX = touch && touch.locationX;
+    const locationY = touch && touch.locationY;
     this.pressInLocation = {pageX, pageY, locationX, locationY};
   },
 
   _getDistanceBetweenPoints: function (aX, aY, bX, bY) {
-    var deltaX = aX - bX;
-    var deltaY = aY - bY;
+    const deltaX = aX - bX;
+    const deltaY = aY - bY;
     return Math.sqrt(deltaX * deltaX + deltaY * deltaY);
   },
 
@@ -703,10 +701,10 @@ var TouchableMixin = {
    * @sideeffects
    */
   _performSideEffectsForTransition: function(curState, nextState, signal, e) {
-    var curIsHighlight = this._isHighlight(curState);
-    var newIsHighlight = this._isHighlight(nextState);
+    const curIsHighlight = this._isHighlight(curState);
+    const newIsHighlight = this._isHighlight(nextState);
 
-    var isFinalSignal =
+    const isFinalSignal =
       signal === Signals.RESPONDER_TERMINATED ||
       signal === Signals.RESPONDER_RELEASE;
 
@@ -729,14 +727,14 @@ var TouchableMixin = {
     }
 
     if (IsPressingIn[curState] && signal === Signals.RESPONDER_RELEASE) {
-      var hasLongPressHandler = !!this.props.onLongPress;
-      var pressIsLongButStillCallOnPress =
+      const hasLongPressHandler = !!this.props.onLongPress;
+      const pressIsLongButStillCallOnPress =
         IsLongPressingIn[curState] && (    // We *are* long pressing..
-          !hasLongPressHandler ||          // But either has no long handler
-          !this.touchableLongPressCancelsPress() // or we're told to ignore it.
+          (// But either has no long handler
+          !hasLongPressHandler || !this.touchableLongPressCancelsPress()) // or we're told to ignore it.
         );
 
-      var shouldInvokePress =  !IsLongPressingIn[curState] || pressIsLongButStillCallOnPress;
+      const shouldInvokePress =  !IsLongPressingIn[curState] || pressIsLongButStillCallOnPress;
       if (shouldInvokePress && this.touchableHandlePress) {
         if (!newIsHighlight && !curIsHighlight) {
           // we never highlighted because of delay, but we should highlight now
@@ -770,7 +768,7 @@ var TouchableMixin = {
 
 };
 
-var Touchable = {
+const Touchable = {
   Mixin: TouchableMixin,
   TOUCH_TARGET_DEBUG: false, // Highlights all touchable targets. Toggle with Inspector.
   /**
diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
index f034e582f4941b..2afef30637b59d 100644
--- a/Libraries/Components/Touchable/TouchableBounce.js
+++ b/Libraries/Components/Touchable/TouchableBounce.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableBounce
  * @flow
@@ -12,13 +10,13 @@
  */
 'use strict';
 
-var Animated = require('Animated');
-var EdgeInsetsPropType = require('EdgeInsetsPropType');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var createReactClass = require('create-react-class');
-var PropTypes = require('prop-types');
-var Touchable = require('Touchable');
+const Animated = require('Animated');
+const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const createReactClass = require('create-react-class');
+const PropTypes = require('prop-types');
+const Touchable = require('Touchable');
 
 type Event = Object;
 
@@ -27,7 +25,7 @@ type State = {
   scale: Animated.Value,
 };
 
-var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
+const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 
 /**
  * Example of using the `TouchableMixin` to play well with other responder
@@ -36,7 +34,7 @@ var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
  * `TouchableMixin` expects us to implement some abstract methods to handle
  * interesting interactions such as `handleTouchablePress`.
  */
-var TouchableBounce = createReactClass({
+const TouchableBounce = createReactClass({
   displayName: 'TouchableBounce',
   mixins: [Touchable.Mixin, NativeMethodsMixin],
 
@@ -117,7 +115,7 @@ var TouchableBounce = createReactClass({
   },
 
   touchableHandlePress: function(e: Event) {
-    var onPressWithCompletion = this.props.onPressWithCompletion;
+    const onPressWithCompletion = this.props.onPressWithCompletion;
     if (onPressWithCompletion) {
       onPressWithCompletion(() => {
         this.state.scale.setValue(0.93);
diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index 04af3d17fff631..19680b236528c0 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableHighlight
  * @flow
@@ -15,6 +13,7 @@
 const ColorPropType = require('ColorPropType');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const PropTypes = require('prop-types');
+const Platform = require('Platform');
 const React = require('React');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 const StyleSheet = require('StyleSheet');
@@ -174,10 +173,17 @@ const TouchableHighlight = createReactClass({
      * shiftDistanceY: Defaults to 2.0.
      * tiltAngle: Defaults to 0.05.
      * magnification: Defaults to 1.0.
+     * pressMagnification: Defaults to 1.0.
+     * pressDuration: Defaults to 0.3.
+     * pressDelay: Defaults to 0.0.
      *
      * @platform ios
      */
     tvParallaxProperties: PropTypes.object,
+    /**
+     * Handy for snapshot tests.
+     */
+    testOnly_pressed: PropTypes.bool,
   },
 
   mixins: [NativeMethodsMixin, Touchable.Mixin],
@@ -186,11 +192,23 @@ const TouchableHighlight = createReactClass({
 
   getInitialState: function() {
     this._isMounted = false;
-    return {
-      ...this.touchableGetInitialState(),
-      extraChildStyle: null,
-      extraUnderlayStyle: null,
-    };
+    if (this.props.testOnly_pressed) {
+      return {
+        ...this.touchableGetInitialState(),
+        extraChildStyle: {
+          opacity: this.props.activeOpacity,
+        },
+        extraUnderlayStyle: {
+          backgroundColor: this.props.underlayColor,
+        },
+      };
+    } else {
+      return {
+        ...this.touchableGetInitialState(),
+        extraChildStyle: null,
+        extraUnderlayStyle: null,
+      };
+    }
   },
 
   componentDidMount: function() {
@@ -232,11 +250,13 @@ const TouchableHighlight = createReactClass({
 
   touchableHandlePress: function(e: PressEvent) {
     clearTimeout(this._hideTimeout);
-    this._showUnderlay();
-    this._hideTimeout = setTimeout(
-      this._hideUnderlay,
-      this.props.delayPressOut,
-    );
+    if (!Platform.isTVOS) {
+      this._showUnderlay();
+      this._hideTimeout = setTimeout(
+        this._hideUnderlay,
+        this.props.delayPressOut,
+      );
+    }
     this.props.onPress && this.props.onPress(e);
   },
 
@@ -282,6 +302,9 @@ const TouchableHighlight = createReactClass({
   _hideUnderlay: function() {
     clearTimeout(this._hideTimeout);
     this._hideTimeout = null;
+    if (this.props.testOnly_pressed) {
+      return;
+    }
     if (this._hasPressHandler()) {
       this.setState({
         extraChildStyle: null,
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
index f5e43340e04389..4f3887642dce43 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
@@ -1,46 +1,44 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableNativeFeedback
  */
 'use strict';
 
-var Platform = require('Platform');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var Touchable = require('Touchable');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
-var UIManager = require('UIManager');
+const Platform = require('Platform');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const Touchable = require('Touchable');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const UIManager = require('UIManager');
 
-var createReactClass = require('create-react-class');
-var ensurePositiveDelayProps = require('ensurePositiveDelayProps');
-var processColor = require('processColor');
+const createReactClass = require('create-react-class');
+const ensurePositiveDelayProps = require('ensurePositiveDelayProps');
+const processColor = require('processColor');
 
-var rippleBackgroundPropType = PropTypes.shape({
+const rippleBackgroundPropType = PropTypes.shape({
   type: PropTypes.oneOf(['RippleAndroid']),
   color: PropTypes.number,
   borderless: PropTypes.bool,
 });
 
-var themeAttributeBackgroundPropType = PropTypes.shape({
+const themeAttributeBackgroundPropType = PropTypes.shape({
   type: PropTypes.oneOf(['ThemeAttrAndroid']),
   attribute: PropTypes.string.isRequired,
 });
 
-var backgroundPropType = PropTypes.oneOfType([
+const backgroundPropType = PropTypes.oneOfType([
   rippleBackgroundPropType,
   themeAttributeBackgroundPropType,
 ]);
 
 type Event = Object;
 
-var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
+const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 
 /**
  * A wrapper for making views respond properly to touches (Android only).
@@ -71,7 +69,7 @@ var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
  * ```
  */
 
-var TouchableNativeFeedback = createReactClass({
+const TouchableNativeFeedback = createReactClass({
   displayName: 'TouchableNativeFeedback',
   propTypes: {
     ...TouchableWithoutFeedback.propTypes,
@@ -84,6 +82,11 @@ var TouchableNativeFeedback = createReactClass({
      */
     background: backgroundPropType,
 
+    /**
+     * TV preferred focus (see documentation for the View component).
+     */
+    hasTVPreferredFocus: PropTypes.bool,
+
     /**
      * Set to true to add the ripple effect to the foreground of the view, instead of the
      * background. This is useful if one of your child views has a background of its own, or you're
@@ -158,7 +161,9 @@ var TouchableNativeFeedback = createReactClass({
   touchableHandleActivePressIn: function(e: Event) {
     this.props.onPressIn && this.props.onPressIn(e);
     this._dispatchPressedStateChange(true);
-    this._dispatchHotspotUpdate(this.pressInLocation.locationX, this.pressInLocation.locationY);
+    if (this.pressInLocation) {
+      this._dispatchHotspotUpdate(this.pressInLocation.locationX, this.pressInLocation.locationY);
+    }
   },
 
   touchableHandleActivePressOut: function(e: Event) {
@@ -235,7 +240,7 @@ var TouchableNativeFeedback = createReactClass({
       this.props.useForeground && TouchableNativeFeedback.canUseNativeForeground()
         ? 'nativeForegroundAndroid'
         : 'nativeBackgroundAndroid';
-    var childProps = {
+    const childProps = {
       ...child.props,
       [drawableProp]: this.props.background,
       accessible: this.props.accessible !== false,
@@ -246,6 +251,8 @@ var TouchableNativeFeedback = createReactClass({
       testID: this.props.testID,
       onLayout: this.props.onLayout,
       hitSlop: this.props.hitSlop,
+      isTVSelectable: true,
+      hasTVPreferredFocus: this.props.hasTVPreferredFocus,
       onStartShouldSetResponder: this.touchableHandleStartShouldSetResponder,
       onResponderTerminationRequest: this.touchableHandleResponderTerminationRequest,
       onResponderGrant: this.touchableHandleResponderGrant,
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
index 99abaa3a07055a..e898d20ab64a97 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
@@ -1,22 +1,25 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableNativeFeedback
  */
 
 'use strict';
 
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var View = require('View');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const View = require('View');
 
 class DummyTouchableNativeFeedback extends React.Component {
+  static SelectableBackground = () => ({});
+  static SelectableBackgroundBorderless = () => ({});
+  static Ripple = () => ({});
+  static canUseNativeForeground = () => false;
+
   render() {
     return (
       <View style={[styles.container, this.props.style]}>
@@ -26,7 +29,7 @@ class DummyTouchableNativeFeedback extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     height: 100,
     width: 300,
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index a27907ecef88be..8ff2ab8d0f2a34 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableOpacity
  * @noflow
@@ -13,22 +11,22 @@
 
 // Note (avik): add @flow when Flow supports spread properties in propTypes
 
-var Animated = require('Animated');
-var Easing = require('Easing');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var PropTypes = require('prop-types');
-var TimerMixin = require('react-timer-mixin');
-var Touchable = require('Touchable');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const Animated = require('Animated');
+const Easing = require('Easing');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const PropTypes = require('prop-types');
+const TimerMixin = require('react-timer-mixin');
+const Touchable = require('Touchable');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 
-var createReactClass = require('create-react-class');
-var ensurePositiveDelayProps = require('ensurePositiveDelayProps');
-var flattenStyle = require('flattenStyle');
+const createReactClass = require('create-react-class');
+const ensurePositiveDelayProps = require('ensurePositiveDelayProps');
+const flattenStyle = require('flattenStyle');
 
 type Event = Object;
 
-var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
+const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 
 /**
  * A wrapper for making views respond properly to touches.
@@ -118,7 +116,7 @@ var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
  * ```
  *
  */
-var TouchableOpacity = createReactClass({
+const TouchableOpacity = createReactClass({
   displayName: 'TouchableOpacity',
   mixins: [TimerMixin, Touchable.Mixin, NativeMethodsMixin],
 
@@ -130,9 +128,7 @@ var TouchableOpacity = createReactClass({
      */
     activeOpacity: PropTypes.number,
     /**
-     * *(Apple TV only)* TV preferred focus (see documentation for the View component).
-     *
-     * @platform ios
+     * TV preferred focus (see documentation for the View component).
      */
     hasTVPreferredFocus: PropTypes.bool,
     /**
@@ -162,6 +158,12 @@ var TouchableOpacity = createReactClass({
     ensurePositiveDelayProps(nextProps);
   },
 
+  componentDidUpdate: function(prevProps, prevState) {
+    if (this.props.disabled !== prevProps.disabled) {
+      this._opacityInactive(250);
+    }
+  },
+
   /**
    * Animate the touchable to a new opacity.
    */
@@ -236,7 +238,7 @@ var TouchableOpacity = createReactClass({
   },
 
   _getChildStyleOpacityWithDefault: function() {
-   var childStyle = flattenStyle(this.props.style) || {};
+   const childStyle = flattenStyle(this.props.style) || {};
    return childStyle.opacity == undefined ? 1 : childStyle.opacity;
  },
 
diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
index 2a285dfa8013c6..642c8593cbe023 100755
--- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js
+++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableWithoutFeedback
  * @flow
diff --git a/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js b/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js
index e537f2be044863..8f036c71e8cddf 100644
--- a/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js
+++ b/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
index 99a94fca6af72f..396b7387b218cc 100644
--- a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
+++ b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Components/Touchable/ensureComponentIsNative.js b/Libraries/Components/Touchable/ensureComponentIsNative.js
index c66735b508b16c..63c1e8bf8d02d0 100644
--- a/Libraries/Components/Touchable/ensureComponentIsNative.js
+++ b/Libraries/Components/Touchable/ensureComponentIsNative.js
@@ -1,19 +1,17 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ensureComponentIsNative
  * @flow
  */
 'use strict';
 
-var invariant = require('fbjs/lib/invariant');
+const invariant = require('fbjs/lib/invariant');
 
-var ensureComponentIsNative = function(component: any) {
+const ensureComponentIsNative = function(component: any) {
   invariant(
     component && typeof component.setNativeProps === 'function',
     'Touchable child must either be native or forward setNativeProps to a ' +
diff --git a/Libraries/Components/Touchable/ensurePositiveDelayProps.js b/Libraries/Components/Touchable/ensurePositiveDelayProps.js
index d2f6a09e8c89ed..51b97f5ca42e68 100644
--- a/Libraries/Components/Touchable/ensurePositiveDelayProps.js
+++ b/Libraries/Components/Touchable/ensurePositiveDelayProps.js
@@ -1,19 +1,17 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ensurePositiveDelayProps
  * @flow
  */
 'use strict';
 
-var invariant = require('fbjs/lib/invariant');
+const invariant = require('fbjs/lib/invariant');
 
-var ensurePositiveDelayProps = function(props: any) {
+const ensurePositiveDelayProps = function(props: any) {
   invariant(
     !(props.delayPressIn < 0 || props.delayPressOut < 0 ||
       props.delayLongPress < 0),
diff --git a/Libraries/Components/UnimplementedViews/UnimplementedView.js b/Libraries/Components/UnimplementedViews/UnimplementedView.js
index 15568f4b7d08e1..5da72d04f35430 100644
--- a/Libraries/Components/UnimplementedViews/UnimplementedView.js
+++ b/Libraries/Components/UnimplementedViews/UnimplementedView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule UnimplementedView
  * @flow
diff --git a/Libraries/Components/View/FabricView.js b/Libraries/Components/View/FabricView.js
new file mode 100644
index 00000000000000..4d686f7beb29cb
--- /dev/null
+++ b/Libraries/Components/View/FabricView.js
@@ -0,0 +1,113 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule FabricView
+ * @flow
+ * @format
+ */
+'use strict';
+
+/**
+ * This is a temporary fork of View.js for Fabric purpose.
+ * Do not use outside of Fabric tree.
+ */
+
+const Platform = require('Platform');
+const React = require('React');
+const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
+const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
+const ViewPropTypes = require('ViewPropTypes');
+const {NativeMethodsMixin} = require('ReactFabricInternals');
+const {ViewContextTypes} = require('ViewContext');
+
+const createReactClass = require('create-react-class');
+const invariant = require('fbjs/lib/invariant');
+const requireFabricComponent = require('requireFabricComponent');
+
+import type {ViewProps} from 'ViewPropTypes';
+import type {ViewChildContext} from 'ViewContext';
+
+export type Props = ViewProps;
+
+/**
+ * The most fundamental component for building a UI.
+ *
+ * See http://facebook.github.io/react-native/docs/view.html
+ */
+const View = createReactClass({
+  displayName: 'View',
+  // TODO: We should probably expose the mixins, viewConfig, and statics publicly. For example,
+  // one of the props is of type AccessibilityComponentType. That is defined as a const[] above,
+  // but it is not rendered by the docs, since `statics` below is not rendered. So its Possible
+  // values had to be hardcoded.
+  mixins: [NativeMethodsMixin],
+
+  // `propTypes` should not be accessed directly on View since this wrapper only
+  // exists for DEV mode. However it's important for them to be declared.
+  // If the object passed to `createClass` specifies `propTypes`, Flow will
+  // create a static type from it.
+  propTypes: ViewPropTypes,
+
+  /**
+   * `NativeMethodsMixin` will look for this when invoking `setNativeProps`. We
+   * make `this` look like an actual native component class.
+   */
+  viewConfig: {
+    uiViewClassName: 'RCTView',
+    validAttributes: ReactNativeViewAttributes.RCTView,
+  },
+
+  childContextTypes: ViewContextTypes,
+
+  getChildContext(): ViewChildContext {
+    return {
+      isInAParentText: false,
+    };
+  },
+
+  render() {
+    invariant(
+      !(this.context.isInAParentText && Platform.OS === 'android'),
+      'Nesting of <View> within <Text> is not supported on Android.',
+    );
+
+    // WARNING: This method will not be used in production mode as in that mode we
+    // replace wrapper component View with generated native wrapper RCTView. Avoid
+    // adding functionality this component that you'd want to be available in both
+    // dev and prod modes.
+    return <RCTView {...this.props} />;
+  },
+});
+
+const RCTView = requireFabricComponent('RCTView', View, {
+  nativeOnly: {
+    nativeBackgroundAndroid: true,
+    nativeForegroundAndroid: true,
+  },
+  fabric: true,
+});
+
+if (__DEV__) {
+  const UIManager = require('UIManager');
+  const viewConfig =
+    (UIManager.viewConfigs && UIManager.viewConfigs.RCTView) || {};
+  for (const prop in viewConfig.nativeProps) {
+    const viewAny: any = View; // Appease flow
+    if (!viewAny.propTypes[prop] && !ReactNativeStyleAttributes[prop]) {
+      throw new Error(
+        'View is missing propType for native prop `' + prop + '`',
+      );
+    }
+  }
+}
+
+let ViewToExport = RCTView;
+if (__DEV__) {
+  ViewToExport = View;
+}
+
+// No one should depend on the DEV-mode createClass View wrapper.
+module.exports = ((ViewToExport: any): typeof RCTView);
diff --git a/Libraries/Components/View/PlatformViewPropTypes.android.js b/Libraries/Components/View/PlatformViewPropTypes.android.js
deleted file mode 100644
index 7d4734bdaa5f84..00000000000000
--- a/Libraries/Components/View/PlatformViewPropTypes.android.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule PlatformViewPropTypes
- * @flow
- */
-
-module.export = {};
diff --git a/Libraries/Components/View/PlatformViewPropTypes.ios.js b/Libraries/Components/View/PlatformViewPropTypes.ios.js
deleted file mode 100644
index 7957c7b4a90ecf..00000000000000
--- a/Libraries/Components/View/PlatformViewPropTypes.ios.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule PlatformViewPropTypes
- * @flow
- */
-
-const Platform = require('Platform');
-
-var TVViewPropTypes = {};
-if (Platform.isTVOS) {
-  TVViewPropTypes = require('TVViewPropTypes');
-}
-
-module.exports = TVViewPropTypes;
diff --git a/Libraries/Components/View/PlatformViewPropTypes.js b/Libraries/Components/View/PlatformViewPropTypes.js
new file mode 100644
index 00000000000000..891fa34572a4f7
--- /dev/null
+++ b/Libraries/Components/View/PlatformViewPropTypes.js
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule PlatformViewPropTypes
+ * @flow
+ */
+
+const Platform = require('Platform');
+
+let TVViewPropTypes = {};
+// We need to always include TVViewPropTypes on Android
+// as unlike on iOS we can't detect TV devices at build time
+// and hence make view manager export a different list of native properties.
+if (Platform.isTV || Platform.OS === 'android') {
+  TVViewPropTypes = require('TVViewPropTypes');
+}
+
+module.exports = TVViewPropTypes;
diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js
index 821c5fa9167e77..a9441cad97f156 100644
--- a/Libraries/Components/View/ReactNativeStyleAttributes.js
+++ b/Libraries/Components/View/ReactNativeStyleAttributes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ReactNativeStyleAttributes
  * @flow
@@ -12,19 +10,19 @@
 
 'use strict';
 
-var ImageStylePropTypes = require('ImageStylePropTypes');
-var TextStylePropTypes = require('TextStylePropTypes');
-var ViewStylePropTypes = require('ViewStylePropTypes');
+const ImageStylePropTypes = require('ImageStylePropTypes');
+const TextStylePropTypes = require('TextStylePropTypes');
+const ViewStylePropTypes = require('ViewStylePropTypes');
 
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
  * found when Flow v0.54 was deployed. To see the error delete this comment and
  * run Flow. */
-var keyMirror = require('fbjs/lib/keyMirror');
-var processColor = require('processColor');
-var processTransform = require('processTransform');
-var sizesDiffer = require('sizesDiffer');
+const keyMirror = require('fbjs/lib/keyMirror');
+const processColor = require('processColor');
+const processTransform = require('processTransform');
+const sizesDiffer = require('sizesDiffer');
 
-var ReactNativeStyleAttributes = {
+const ReactNativeStyleAttributes = {
   ...keyMirror(ViewStylePropTypes),
   ...keyMirror(TextStylePropTypes),
   ...keyMirror(ImageStylePropTypes),
@@ -33,7 +31,7 @@ var ReactNativeStyleAttributes = {
 ReactNativeStyleAttributes.transform = { process: processTransform };
 ReactNativeStyleAttributes.shadowOffset = { diff: sizesDiffer };
 
-var colorAttributes = { process: processColor };
+const colorAttributes = { process: processColor };
 ReactNativeStyleAttributes.backgroundColor = colorAttributes;
 ReactNativeStyleAttributes.borderBottomColor = colorAttributes;
 ReactNativeStyleAttributes.borderColor = colorAttributes;
diff --git a/Libraries/Components/View/ReactNativeViewAttributes.js b/Libraries/Components/View/ReactNativeViewAttributes.js
index ab12b9fdc4d860..26fb368aceb96f 100644
--- a/Libraries/Components/View/ReactNativeViewAttributes.js
+++ b/Libraries/Components/View/ReactNativeViewAttributes.js
@@ -1,19 +1,17 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ReactNativeViewAttributes
  * @flow
  */
 'use strict';
 
-var ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
+const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
 
-var ReactNativeViewAttributes = {};
+const ReactNativeViewAttributes = {};
 
 ReactNativeViewAttributes.UIView = {
   pointerEvents: true,
diff --git a/Libraries/Components/View/ShadowPropTypesIOS.js b/Libraries/Components/View/ShadowPropTypesIOS.js
index 8bf7acbfe99f13..f4f2f0ab4c481a 100644
--- a/Libraries/Components/View/ShadowPropTypesIOS.js
+++ b/Libraries/Components/View/ShadowPropTypesIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ShadowPropTypesIOS
  * @flow
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index 2393f43526b709..0a77bff8a40766 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule View
  * @flow
@@ -12,15 +10,13 @@
  */
 'use strict';
 
-const NativeMethodsMixin = require('NativeMethodsMixin');
 const Platform = require('Platform');
 const React = require('React');
+const ReactNative = require('ReactNative');
 const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 const ViewPropTypes = require('ViewPropTypes');
 const {ViewContextTypes} = require('ViewContext');
-
-const createReactClass = require('create-react-class');
 const invariant = require('fbjs/lib/invariant');
 const requireNativeComponent = require('requireNativeComponent');
 
@@ -30,40 +26,26 @@ import type {ViewChildContext} from 'ViewContext';
 export type Props = ViewProps;
 
 /**
- * The most fundamental component for building a UI.
+ * The most fundamental component for building a UI, View is a container that
+ * supports layout with flexbox, style, some touch handling, and accessibility
+ * controls.
  *
- * See http://facebook.github.io/react-native/docs/view.html
+ * @see http://facebook.github.io/react-native/docs/view.html
  */
-const View = createReactClass({
-  displayName: 'View',
-  // TODO: We should probably expose the mixins, viewConfig, and statics publicly. For example,
-  // one of the props is of type AccessibilityComponentType. That is defined as a const[] above,
-  // but it is not rendered by the docs, since `statics` below is not rendered. So its Possible
-  // values had to be hardcoded.
-  mixins: [NativeMethodsMixin],
-
-  // `propTypes` should not be accessed directly on View since this wrapper only
-  // exists for DEV mode. However it's important for them to be declared.
-  // If the object passed to `createClass` specifies `propTypes`, Flow will
-  // create a static type from it.
-  propTypes: ViewPropTypes,
+class View extends ReactNative.NativeComponent<Props> {
+  static propTypes = ViewPropTypes;
+  static childContextTypes = ViewContextTypes;
 
-  /**
-   * `NativeMethodsMixin` will look for this when invoking `setNativeProps`. We
-   * make `this` look like an actual native component class.
-   */
-  viewConfig: {
+  viewConfig = {
     uiViewClassName: 'RCTView',
     validAttributes: ReactNativeViewAttributes.RCTView,
-  },
-
-  childContextTypes: ViewContextTypes,
+  };
 
   getChildContext(): ViewChildContext {
     return {
       isInAParentText: false,
     };
-  },
+  }
 
   render() {
     invariant(
@@ -76,8 +58,8 @@ const View = createReactClass({
     // adding functionality this component that you'd want to be available in both
     // dev and prod modes.
     return <RCTView {...this.props} />;
-  },
-});
+  }
+}
 
 const RCTView = requireNativeComponent('RCTView', View, {
   nativeOnly: {
@@ -106,4 +88,4 @@ if (__DEV__) {
 }
 
 // No one should depend on the DEV-mode createClass View wrapper.
-module.exports = ((ViewToExport: any): typeof RCTView);
+module.exports = ((ViewToExport: any): typeof View);
diff --git a/Libraries/Components/View/View.js.flow b/Libraries/Components/View/View.js.flow
deleted file mode 100644
index fb62d61037f498..00000000000000
--- a/Libraries/Components/View/View.js.flow
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule View
- * @flow
- * @format
- */
-
-'use strict';
-
-const {NativeComponent} = require('ReactNative');
-
-import type {ViewProps} from 'ViewPropTypes';
-
-export type Props = ViewProps;
-
-/**
- * Host components in React 16 are represented by strings (eg "div", "View").
- * This is inconvenient for users who want to type a ref (eg `ref: View`).
- * The following type isn't sound but it enables consistent Flow types
- * for various default React Native components, so it seems a good tradeoff.
- */
-declare class View extends NativeComponent<void, ViewProps> {}
-
-module.exports = View;
diff --git a/Libraries/Components/View/ViewAccessibility.js b/Libraries/Components/View/ViewAccessibility.js
index c5f6c42e3221aa..b45366fd079755 100644
--- a/Libraries/Components/View/ViewAccessibility.js
+++ b/Libraries/Components/View/ViewAccessibility.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewAccessibility
  * @flow
diff --git a/Libraries/Components/View/ViewContext.js b/Libraries/Components/View/ViewContext.js
index ed73187b0bb8d6..563d2b253b93e0 100644
--- a/Libraries/Components/View/ViewContext.js
+++ b/Libraries/Components/View/ViewContext.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewContext
  * @flow
diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
index 20efa0c46765f4..574bd577cc9997 100644
--- a/Libraries/Components/View/ViewPropTypes.js
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -1,16 +1,15 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewPropTypes
  * @flow
  */
 'use strict';
 
+const React = require('React');
 const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const PlatformViewPropTypes = require('PlatformViewPropTypes');
 const PropTypes = require('prop-types');
@@ -28,27 +27,18 @@ import type {
 } from 'ViewAccessibility';
 import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
 import type {TVViewProps} from 'TVViewPropTypes';
+import type {Layout, LayoutEvent} from 'CoreEventTypes';
 
 const stylePropType = StyleSheetPropType(ViewStylePropTypes);
 
-export type ViewLayout = {
-  x: number,
-  y: number,
-  width: number,
-  height: number,
-}
-
-export type ViewLayoutEvent = {
-  nativeEvent: {
-    layout: ViewLayout,
-  }
-}
+export type ViewLayout = Layout;
+export type ViewLayoutEvent = LayoutEvent;
 
 // There's no easy way to create a different type if (Platform.isTVOS):
 // so we must include TVViewProps
 export type ViewProps = {
   accessible?: bool,
-  accessibilityLabel?: React$PropType$Primitive<any>,
+  accessibilityLabel?: null | React$PropType$Primitive<any> | string | Array<any> | any,
   accessibilityActions?: Array<string>,
   accessibilityComponentType?: AccessibilityComponentType,
   accessibilityLiveRegion?: 'none' | 'polite' | 'assertive',
@@ -56,24 +46,25 @@ export type ViewProps = {
   accessibilityTraits?: AccessibilityTrait | Array<AccessibilityTrait>,
   accessibilityViewIsModal?: bool,
   accessibilityElementsHidden?: bool,
+  children?: ?React.Node,
   onAccessibilityAction?: Function,
   onAccessibilityTap?: Function,
   onMagicTap?: Function,
-  testID?: string,
+  testID?: ?string,
   nativeID?: string,
-  onLayout?: (event: ViewLayoutEvent) => void,
-  onResponderGrant?: Function,
-  onResponderMove?: Function,
-  onResponderReject?: Function,
-  onResponderRelease?: Function,
-  onResponderTerminate?: Function,
-  onResponderTerminationRequest?: Function,
-  onStartShouldSetResponder?: Function,
-  onStartShouldSetResponderCapture?: Function,
-  onMoveShouldSetResponder?: Function,
-  onMoveShouldSetResponderCapture?: Function,
-  hitSlop?: EdgeInsetsProp,
-  pointerEvents?: 'box-none'| 'none'| 'box-only'| 'auto',
+  onLayout?: ?(event: LayoutEvent) => void,
+  onResponderGrant?: ?Function,
+  onResponderMove?: ?Function,
+  onResponderReject?: ?Function,
+  onResponderRelease?: ?Function,
+  onResponderTerminate?: ?Function,
+  onResponderTerminationRequest?: ?Function,
+  onStartShouldSetResponder?: ?Function,
+  onStartShouldSetResponderCapture?: ?Function,
+  onMoveShouldSetResponder?: ?Function,
+  onMoveShouldSetResponderCapture?: ?Function,
+  hitSlop?: ?EdgeInsetsProp,
+  pointerEvents?: null | 'box-none'| 'none'| 'box-only'| 'auto',
   style?: stylePropType,
   removeClippedSubviews?: bool,
   renderToHardwareTextureAndroid?: bool,
@@ -86,9 +77,9 @@ module.exports = {
   ...PlatformViewPropTypes,
 
   /**
-   * When `true`, indicates that the view is an accessibility element. 
+   * When `true`, indicates that the view is an accessibility element.
    * By default, all the touchable elements are accessible.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessible
    */
   accessible: PropTypes.bool,
@@ -97,7 +88,7 @@ module.exports = {
    * Overrides the text that's read by the screen reader when the user interacts
    * with the element. By default, the label is constructed by traversing all
    * the children and accumulating all the `Text` nodes separated by space.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilitylabel
    */
   accessibilityLabel: PropTypes.node,
@@ -114,7 +105,7 @@ module.exports = {
    * native one. Works for Android only.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilitycomponenttype
    */
   accessibilityComponentType: PropTypes.oneOf(AccessibilityComponentTypes),
@@ -124,7 +115,7 @@ module.exports = {
    * when this view changes. Works for Android API >= 19 only.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilityliveregion
    */
   accessibilityLiveRegion: PropTypes.oneOf([
@@ -139,7 +130,7 @@ module.exports = {
    * that query the screen. Works for Android only.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#importantforaccessibility
    */
   importantForAccessibility: PropTypes.oneOf([
@@ -156,7 +147,7 @@ module.exports = {
    * You can provide one trait or an array of many traits.
    *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilitytraits
    */
   accessibilityTraits: PropTypes.oneOfType([
@@ -170,17 +161,17 @@ module.exports = {
    * Default is `false`.
    *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilityviewismodal
    */
   accessibilityViewIsModal: PropTypes.bool,
-  
+
   /**
    * A value indicating whether the accessibility elements contained within
    * this accessibility element are hidden.
    *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilityElementsHidden
    */
   accessibilityElementsHidden: PropTypes.bool,
@@ -196,7 +187,7 @@ module.exports = {
   /**
    * When `accessible` is true, the system will try to invoke this function
    * when the user performs accessibility tap gesture.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onaccessibilitytap
    */
   onAccessibilityTap: PropTypes.func,
@@ -204,7 +195,7 @@ module.exports = {
   /**
    * When `accessible` is `true`, the system will invoke this function when the
    * user performs the magic tap gesture.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onmagictap
    */
   onMagicTap: PropTypes.func,
@@ -213,7 +204,7 @@ module.exports = {
    * Used to locate this view in end-to-end tests.
    *
    * > This disables the 'layout-only view removal' optimization for this view!
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#testid
    */
   testID: PropTypes.string,
@@ -222,7 +213,7 @@ module.exports = {
    * Used to locate this view from native classes.
    *
    * > This disables the 'layout-only view removal' optimization for this view!
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#nativeid
    */
   nativeID: PropTypes.string,
@@ -234,12 +225,12 @@ module.exports = {
    */
 
   /**
-   * The View is now responding for touch events. This is the time to highlight 
+   * The View is now responding for touch events. This is the time to highlight
    * and show the user what is happening.
    *
    * `View.props.onResponderGrant: (event) => {}`, where `event` is a synthetic
    * touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onrespondergrant
    */
   onResponderGrant: PropTypes.func,
@@ -247,20 +238,20 @@ module.exports = {
   /**
    * The user is moving their finger.
    *
-   * `View.props.onResponderMove: (event) => {}`, where `event` is a synthetic 
+   * `View.props.onResponderMove: (event) => {}`, where `event` is a synthetic
    * touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onrespondermove
    */
   onResponderMove: PropTypes.func,
 
   /**
-   * Another responder is already active and will not release it to that `View` 
+   * Another responder is already active and will not release it to that `View`
    * asking to be the responder.
    *
-   * `View.props.onResponderReject: (event) => {}`, where `event` is a 
+   * `View.props.onResponderReject: (event) => {}`, where `event` is a
    * synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderreject
    */
   onResponderReject: PropTypes.func,
@@ -268,33 +259,33 @@ module.exports = {
   /**
    * Fired at the end of the touch.
    *
-   * `View.props.onResponderRelease: (event) => {}`, where `event` is a 
+   * `View.props.onResponderRelease: (event) => {}`, where `event` is a
    * synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderrelease
    */
   onResponderRelease: PropTypes.func,
 
   /**
    * The responder has been taken from the `View`. Might be taken by other
-   * views after a call to `onResponderTerminationRequest`, or might be taken 
-   * by the OS without asking (e.g., happens with control center/ notification 
+   * views after a call to `onResponderTerminationRequest`, or might be taken
+   * by the OS without asking (e.g., happens with control center/ notification
    * center on iOS)
    *
-   * `View.props.onResponderTerminate: (event) => {}`, where `event` is a 
+   * `View.props.onResponderTerminate: (event) => {}`, where `event` is a
    * synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderterminate
    */
   onResponderTerminate: PropTypes.func,
 
   /**
-   * Some other `View` wants to become responder and is asking this `View` to 
+   * Some other `View` wants to become responder and is asking this `View` to
    * release its responder. Returning `true` allows its release.
    *
-   * `View.props.onResponderTerminationRequest: (event) => {}`, where `event` 
+   * `View.props.onResponderTerminationRequest: (event) => {}`, where `event`
    * is a synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderterminationrequest
    */
   onResponderTerminationRequest: PropTypes.func,
@@ -302,31 +293,31 @@ module.exports = {
   /**
    * Does this view want to become responder on the start of a touch?
    *
-   * `View.props.onStartShouldSetResponder: (event) => [true | false]`, where 
+   * `View.props.onStartShouldSetResponder: (event) => [true | false]`, where
    * `event` is a synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onstartshouldsetresponder
    */
   onStartShouldSetResponder: PropTypes.func,
 
   /**
-   * If a parent `View` wants to prevent a child `View` from becoming responder 
+   * If a parent `View` wants to prevent a child `View` from becoming responder
    * on a touch start, it should have this handler which returns `true`.
    *
-   * `View.props.onStartShouldSetResponderCapture: (event) => [true | false]`, 
+   * `View.props.onStartShouldSetResponderCapture: (event) => [true | false]`,
    * where `event` is a synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onstartshouldsetrespondercapture
    */
   onStartShouldSetResponderCapture: PropTypes.func,
 
   /**
-   * Does this view want to "claim" touch responsiveness? This is called for 
+   * Does this view want to "claim" touch responsiveness? This is called for
    * every touch move on the `View` when it is not the responder.
    *
-   * `View.props.onMoveShouldSetResponder: (event) => [true | false]`, where 
+   * `View.props.onMoveShouldSetResponder: (event) => [true | false]`, where
    * `event` is a synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onmoveshouldsetresponder
    */
   onMoveShouldSetResponder: PropTypes.func,
@@ -334,10 +325,10 @@ module.exports = {
   /**
    * If a parent `View` wants to prevent a child `View` from becoming responder
    * on a move, it should have this handler which returns `true`.
-   * 
+   *
    * `View.props.onMoveShouldSetResponderCapture: (event) => [true | false]`,
    * where `event` is a synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onMoveShouldsetrespondercapture
    */
   onMoveShouldSetResponderCapture: PropTypes.func,
@@ -350,7 +341,7 @@ module.exports = {
    * > The touch area never extends past the parent view bounds and the Z-index
    * > of sibling views always takes precedence if a touch hits two overlapping
    * > views.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#hitslop
    */
   hitSlop: EdgeInsetsPropType,
@@ -363,14 +354,14 @@ module.exports = {
    * This event is fired immediately once the layout has been calculated, but
    * the new layout may not yet be reflected on the screen at the time the
    * event is received, especially if a layout animation is in progress.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onlayout
    */
   onLayout: PropTypes.func,
 
   /**
    * Controls whether the `View` can be the target of touch events.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#pointerevents
    */
   pointerEvents: PropTypes.oneOf([
@@ -392,7 +383,7 @@ module.exports = {
    * view that contains many subviews that extend outside its bound. The
    * subviews must also have `overflow: hidden`, as should the containing view
    * (or one of its superviews).
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#removeclippedsubviews
    */
   removeClippedSubviews: PropTypes.bool,
@@ -402,7 +393,7 @@ module.exports = {
    * single hardware texture on the GPU.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#rendertohardwaretextureandroid
    */
   renderToHardwareTextureAndroid: PropTypes.bool,
@@ -411,7 +402,7 @@ module.exports = {
    * Whether this `View` should be rendered as a bitmap before compositing.
    *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#shouldrasterizeios
    */
   shouldRasterizeIOS: PropTypes.bool,
@@ -423,17 +414,17 @@ module.exports = {
    * ensure that this `View` exists in the native view hierarchy.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#collapsable
    */
   collapsable: PropTypes.bool,
 
   /**
-   * Whether this `View` needs to rendered offscreen and composited with an 
-   * alpha in order to preserve 100% correct colors and blending behavior. 
+   * Whether this `View` needs to rendered offscreen and composited with an
+   * alpha in order to preserve 100% correct colors and blending behavior.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#needsoffscreenalphacompositing
    */
   needsOffscreenAlphaCompositing: PropTypes.bool,
diff --git a/Libraries/Components/View/ViewStylePropTypes.js b/Libraries/Components/View/ViewStylePropTypes.js
index 3c6886249a74ce..c21ce5934ac33c 100644
--- a/Libraries/Components/View/ViewStylePropTypes.js
+++ b/Libraries/Components/View/ViewStylePropTypes.js
@@ -1,26 +1,24 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewStylePropTypes
  * @flow
  */
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var LayoutPropTypes = require('LayoutPropTypes');
-var ReactPropTypes = require('prop-types');
-var ShadowPropTypesIOS = require('ShadowPropTypesIOS');
-var TransformPropTypes = require('TransformPropTypes');
+const ColorPropType = require('ColorPropType');
+const LayoutPropTypes = require('LayoutPropTypes');
+const ReactPropTypes = require('prop-types');
+const ShadowPropTypesIOS = require('ShadowPropTypesIOS');
+const TransformPropTypes = require('TransformPropTypes');
 
 /**
  * Warning: Some of these properties may not be supported in all releases.
  */
-var ViewStylePropTypes = {
+const ViewStylePropTypes = {
   ...LayoutPropTypes,
   ...ShadowPropTypesIOS,
   ...TransformPropTypes,
diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
index a44cd15b755c72..8463503bd7930b 100644
--- a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
+++ b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
@@ -1,26 +1,24 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewPagerAndroid
  * @flow
  */
 'use strict';
 
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var UIManager = require('UIManager');
-var ViewPropTypes = require('ViewPropTypes');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const UIManager = require('UIManager');
+const ViewPropTypes = require('ViewPropTypes');
 
-var dismissKeyboard = require('dismissKeyboard');
-var requireNativeComponent = require('requireNativeComponent');
+const dismissKeyboard = require('dismissKeyboard');
+const requireNativeComponent = require('requireNativeComponent');
 
-var VIEWPAGER_REF = 'viewPager';
+const VIEWPAGER_REF = 'viewPager';
 
 type Event = Object;
 
@@ -165,7 +163,7 @@ class ViewPagerAndroid extends React.Component<{
       if (!child) {
         return null;
       }
-      var newProps = {
+      const newProps = {
         ...child.props,
         style: [child.props.style, {
           position: 'absolute',
@@ -248,6 +246,6 @@ class ViewPagerAndroid extends React.Component<{
   }
 }
 
-var NativeAndroidViewPager = requireNativeComponent('AndroidViewPager', ViewPagerAndroid);
+const NativeAndroidViewPager = requireNativeComponent('AndroidViewPager', ViewPagerAndroid);
 
 module.exports = ViewPagerAndroid;
diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js b/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js
index 35d4196b489037..ee0022ae5453fa 100644
--- a/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js
+++ b/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewPagerAndroid
  */
diff --git a/Libraries/Components/WebView/WebView.android.js b/Libraries/Components/WebView/WebView.android.js
index 07fb34309bf344..16f2991df1e770 100644
--- a/Libraries/Components/WebView/WebView.android.js
+++ b/Libraries/Components/WebView/WebView.android.js
@@ -1,39 +1,37 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebView
  */
 'use strict';
 
-var EdgeInsetsPropType = require('EdgeInsetsPropType');
-var ActivityIndicator = require('ActivityIndicator');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var StyleSheet = require('StyleSheet');
-var UIManager = require('UIManager');
-var View = require('View');
-var ViewPropTypes = require('ViewPropTypes');
+const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const ActivityIndicator = require('ActivityIndicator');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const StyleSheet = require('StyleSheet');
+const UIManager = require('UIManager');
+const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
-var deprecatedPropType = require('deprecatedPropType');
-var keyMirror = require('fbjs/lib/keyMirror');
-var requireNativeComponent = require('requireNativeComponent');
-var resolveAssetSource = require('resolveAssetSource');
+const deprecatedPropType = require('deprecatedPropType');
+const keyMirror = require('fbjs/lib/keyMirror');
+const requireNativeComponent = require('requireNativeComponent');
+const resolveAssetSource = require('resolveAssetSource');
 
-var RCT_WEBVIEW_REF = 'webview';
+const RCT_WEBVIEW_REF = 'webview';
 
-var WebViewState = keyMirror({
+const WebViewState = keyMirror({
   IDLE: null,
   LOADING: null,
   ERROR: null,
 });
 
-var defaultRenderLoading = () => (
+const defaultRenderLoading = () => (
   <View style={styles.loadingView}>
     <ActivityIndicator
       style={styles.loadingProgressBar}
@@ -254,12 +252,12 @@ class WebView extends React.Component {
   }
 
   render() {
-    var otherView = null;
+    let otherView = null;
 
    if (this.state.viewState === WebViewState.LOADING) {
       otherView = (this.props.renderLoading || defaultRenderLoading)();
     } else if (this.state.viewState === WebViewState.ERROR) {
-      var errorEvent = this.state.lastErrorEvent;
+      const errorEvent = this.state.lastErrorEvent;
       otherView = this.props.renderError && this.props.renderError(
         errorEvent.domain,
         errorEvent.code,
@@ -268,14 +266,14 @@ class WebView extends React.Component {
       console.error('RCTWebView invalid state encountered: ' + this.state.loading);
     }
 
-    var webViewStyles = [styles.container, this.props.style];
+    const webViewStyles = [styles.container, this.props.style];
     if (this.state.viewState === WebViewState.LOADING ||
       this.state.viewState === WebViewState.ERROR) {
       // if we're in either LOADING or ERROR states, don't show the webView
       webViewStyles.push(styles.hidden);
     }
 
-    var source = this.props.source || {};
+    const source = this.props.source || {};
     if (this.props.html) {
       source.html = this.props.html;
     } else if (this.props.url) {
@@ -292,7 +290,7 @@ class WebView extends React.Component {
 
     let NativeWebView = nativeConfig.component || RCTWebView;
 
-    var webView =
+    const webView =
       <NativeWebView
         ref={RCT_WEBVIEW_REF}
         key="webViewKey"
@@ -401,14 +399,14 @@ class WebView extends React.Component {
   };
 
   onLoadingStart = (event) => {
-    var onLoadStart = this.props.onLoadStart;
+    const onLoadStart = this.props.onLoadStart;
     onLoadStart && onLoadStart(event);
     this.updateNavigationState(event);
   };
 
   onLoadingError = (event) => {
     event.persist(); // persist this event because we need to store it
-    var {onError, onLoadEnd} = this.props;
+    const {onError, onLoadEnd} = this.props;
     onError && onError(event);
     onLoadEnd && onLoadEnd(event);
     console.warn('Encountered an error loading page', event.nativeEvent);
@@ -420,7 +418,7 @@ class WebView extends React.Component {
   };
 
   onLoadingFinish = (event) => {
-    var {onLoad, onLoadEnd} = this.props;
+    const {onLoad, onLoadEnd} = this.props;
     onLoad && onLoad(event);
     onLoadEnd && onLoadEnd(event);
     this.setState({
@@ -430,14 +428,14 @@ class WebView extends React.Component {
   };
 
   onMessage = (event: Event) => {
-    var {onMessage} = this.props;
+    const {onMessage} = this.props;
     onMessage && onMessage(event);
   }
 }
 
-var RCTWebView = requireNativeComponent('RCTWebView', WebView, WebView.extraNativeComponentConfig);
+const RCTWebView = requireNativeComponent('RCTWebView', WebView, WebView.extraNativeComponentConfig);
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     flex: 1,
   },
diff --git a/Libraries/Components/WebView/WebView.ios.js b/Libraries/Components/WebView/WebView.ios.js
index b68aecd1864f74..f01cfae537dd33 100644
--- a/Libraries/Components/WebView/WebView.ios.js
+++ b/Libraries/Components/WebView/WebView.ios.js
@@ -1,41 +1,39 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebView
  * @noflow
  */
 'use strict';
 
-var ActivityIndicator = require('ActivityIndicator');
-var EdgeInsetsPropType = require('EdgeInsetsPropType');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var UIManager = require('UIManager');
-var View = require('View');
-var ViewPropTypes = require('ViewPropTypes');
-var ScrollView = require('ScrollView');
-
-var deprecatedPropType = require('deprecatedPropType');
-var invariant = require('fbjs/lib/invariant');
-var keyMirror = require('fbjs/lib/keyMirror');
-var processDecelerationRate = require('processDecelerationRate');
-var requireNativeComponent = require('requireNativeComponent');
-var resolveAssetSource = require('resolveAssetSource');
-
-var RCTWebViewManager = require('NativeModules').WebViewManager;
-
-var BGWASH = 'rgba(255,255,255,0.8)';
-var RCT_WEBVIEW_REF = 'webview';
-
-var WebViewState = keyMirror({
+const ActivityIndicator = require('ActivityIndicator');
+const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const UIManager = require('UIManager');
+const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
+const ScrollView = require('ScrollView');
+
+const deprecatedPropType = require('deprecatedPropType');
+const invariant = require('fbjs/lib/invariant');
+const keyMirror = require('fbjs/lib/keyMirror');
+const processDecelerationRate = require('processDecelerationRate');
+const requireNativeComponent = require('requireNativeComponent');
+const resolveAssetSource = require('resolveAssetSource');
+
+const RCTWebViewManager = require('NativeModules').WebViewManager;
+
+const BGWASH = 'rgba(255,255,255,0.8)';
+const RCT_WEBVIEW_REF = 'webview';
+
+const WebViewState = keyMirror({
   IDLE: null,
   LOADING: null,
   ERROR: null,
@@ -69,12 +67,12 @@ const DataDetectorTypes = [
   'all',
 ];
 
-var defaultRenderLoading = () => (
+const defaultRenderLoading = () => (
   <View style={styles.loadingView}>
     <ActivityIndicator />
   </View>
 );
-var defaultRenderError = (errorDomain, errorCode, errorDesc) => (
+const defaultRenderError = (errorDomain, errorCode, errorDesc) => (
   <View style={styles.errorContainer}>
     <Text style={styles.errorTextTitle}>
       Error loading page
@@ -417,12 +415,12 @@ class WebView extends React.Component {
   }
 
   render() {
-    var otherView = null;
+    let otherView = null;
 
     if (this.state.viewState === WebViewState.LOADING) {
       otherView = (this.props.renderLoading || defaultRenderLoading)();
     } else if (this.state.viewState === WebViewState.ERROR) {
-      var errorEvent = this.state.lastErrorEvent;
+      const errorEvent = this.state.lastErrorEvent;
       invariant(
         errorEvent != null,
         'lastErrorEvent expected to be non-null'
@@ -438,7 +436,7 @@ class WebView extends React.Component {
       );
     }
 
-    var webViewStyles = [styles.container, styles.webView, this.props.style];
+    const webViewStyles = [styles.container, styles.webView, this.props.style];
     if (this.state.viewState === WebViewState.LOADING ||
       this.state.viewState === WebViewState.ERROR) {
       // if we're in either LOADING or ERROR states, don't show the webView
@@ -449,15 +447,15 @@ class WebView extends React.Component {
 
     const viewManager = nativeConfig.viewManager || RCTWebViewManager;
 
-    var onShouldStartLoadWithRequest = this.props.onShouldStartLoadWithRequest && ((event: Event) => {
-      var shouldStart = this.props.onShouldStartLoadWithRequest &&
+    const onShouldStartLoadWithRequest = this.props.onShouldStartLoadWithRequest && ((event: Event) => {
+      const shouldStart = this.props.onShouldStartLoadWithRequest &&
         this.props.onShouldStartLoadWithRequest(event.nativeEvent);
       viewManager.startLoadWithResult(!!shouldStart, event.nativeEvent.lockIdentifier);
     });
 
-    var decelerationRate = processDecelerationRate(this.props.decelerationRate);
+    const decelerationRate = processDecelerationRate(this.props.decelerationRate);
 
-    var source = this.props.source || {};
+    const source = this.props.source || {};
     if (this.props.html) {
       source.html = this.props.html;
     } else if (this.props.url) {
@@ -468,7 +466,7 @@ class WebView extends React.Component {
 
     const NativeWebView = nativeConfig.component || RCTWebView;
 
-    var webView =
+    const webView =
       <NativeWebView
         ref={RCT_WEBVIEW_REF}
         key="webViewKey"
@@ -596,14 +594,14 @@ class WebView extends React.Component {
   };
 
   _onLoadingStart = (event: Event) => {
-    var onLoadStart = this.props.onLoadStart;
+    const onLoadStart = this.props.onLoadStart;
     onLoadStart && onLoadStart(event);
     this._updateNavigationState(event);
   };
 
   _onLoadingError = (event: Event) => {
     event.persist(); // persist this event because we need to store it
-    var {onError, onLoadEnd} = this.props;
+    const {onError, onLoadEnd} = this.props;
     onError && onError(event);
     onLoadEnd && onLoadEnd(event);
     console.warn('Encountered an error loading page', event.nativeEvent);
@@ -615,7 +613,7 @@ class WebView extends React.Component {
   };
 
   _onLoadingFinish = (event: Event) => {
-    var {onLoad, onLoadEnd} = this.props;
+    const {onLoad, onLoadEnd} = this.props;
     onLoad && onLoad(event);
     onLoadEnd && onLoadEnd(event);
     this.setState({
@@ -625,14 +623,14 @@ class WebView extends React.Component {
   };
 
   _onMessage = (event: Event) => {
-    var {onMessage} = this.props;
+    const {onMessage} = this.props;
     onMessage && onMessage(event);
   }
 }
 
-var RCTWebView = requireNativeComponent('RCTWebView', WebView, WebView.extraNativeComponentConfig);
+const RCTWebView = requireNativeComponent('RCTWebView', WebView, WebView.extraNativeComponentConfig);
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     flex: 1,
   },
diff --git a/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
index 347bdf79ba1e27..beaa629d765d77 100644
--- a/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
+++ b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Core/Devtools/getDevServer.js b/Libraries/Core/Devtools/getDevServer.js
index ff34314cadd839..975a75f827b240 100644
--- a/Libraries/Core/Devtools/getDevServer.js
+++ b/Libraries/Core/Devtools/getDevServer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule getDevServer
  * @flow
@@ -27,7 +25,7 @@ type DevServerInfo = {
  */
 function getDevServer(): DevServerInfo {
   if (_cachedDevServerURL === undefined) {
-    const match = SourceCode.scriptURL && SourceCode.scriptURL.match(/^https?:\/\/.*?\//);
+    const match = SourceCode && SourceCode.scriptURL && SourceCode.scriptURL.match(/^https?:\/\/.*?\//);
     _cachedDevServerURL = match ? match[0] : null;
   }
 
diff --git a/Libraries/Core/Devtools/openFileInEditor.js b/Libraries/Core/Devtools/openFileInEditor.js
index 650cb568340c4f..a5f9da59e6b1ab 100644
--- a/Libraries/Core/Devtools/openFileInEditor.js
+++ b/Libraries/Core/Devtools/openFileInEditor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule openFileInEditor
  * @flow
diff --git a/Libraries/Core/Devtools/parseErrorStack.js b/Libraries/Core/Devtools/parseErrorStack.js
index 11466533f5585f..e1ae27294fee68 100644
--- a/Libraries/Core/Devtools/parseErrorStack.js
+++ b/Libraries/Core/Devtools/parseErrorStack.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule parseErrorStack
  * @flow
diff --git a/Libraries/Core/Devtools/setupDevtools.js b/Libraries/Core/Devtools/setupDevtools.js
index b1c32960abf5a9..cbfb8df3983b59 100644
--- a/Libraries/Core/Devtools/setupDevtools.js
+++ b/Libraries/Core/Devtools/setupDevtools.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule setupDevtools
  * @flow
diff --git a/Libraries/Core/Devtools/symbolicateStackTrace.js b/Libraries/Core/Devtools/symbolicateStackTrace.js
index 283e4b78cc94aa..5ac25fe03e98fb 100644
--- a/Libraries/Core/Devtools/symbolicateStackTrace.js
+++ b/Libraries/Core/Devtools/symbolicateStackTrace.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule symbolicateStackTrace
  * @flow
diff --git a/Libraries/Core/ExceptionsManager.js b/Libraries/Core/ExceptionsManager.js
index 56ced328d2114a..8a63ec3bff4bcc 100644
--- a/Libraries/Core/ExceptionsManager.js
+++ b/Libraries/Core/ExceptionsManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ExceptionsManager
  * @flow
diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
index f5f3d3cc4d8429..c97576397a94b6 100644
--- a/Libraries/Core/InitializeCore.js
+++ b/Libraries/Core/InitializeCore.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InitializeCore
  * @flow
@@ -27,6 +25,8 @@
  */
 'use strict';
 
+const {polyfillObjectProperty, polyfillGlobal} = require('PolyfillFunctions');
+
 if (global.GLOBAL === undefined) {
   global.GLOBAL = global;
 }
@@ -35,8 +35,6 @@ if (global.window === undefined) {
   global.window = global;
 }
 
-const defineLazyObjectProperty = require('defineLazyObjectProperty');
-
 // Set up collections
 const _shouldPolyfillCollection = require('_shouldPolyfillES6Collection');
 if (_shouldPolyfillCollection('Map')) {
@@ -46,50 +44,6 @@ if (_shouldPolyfillCollection('Set')) {
   polyfillGlobal('Set', () => require('Set'));
 }
 
-/**
- * Sets an object's property. If a property with the same name exists, this will
- * replace it but maintain its descriptor configuration. The property will be
- * replaced with a lazy getter.
- *
- * In DEV mode the original property value will be preserved as `original[PropertyName]`
- * so that, if necessary, it can be restored. For example, if you want to route
- * network requests through DevTools (to trace them):
- *
- *   global.XMLHttpRequest = global.originalXMLHttpRequest;
- *
- * @see https://github.com/facebook/react-native/issues/934
- */
-function defineLazyProperty<T>(
-  object: Object,
-  name: string,
-  getValue: () => T,
-): void {
-  const descriptor = Object.getOwnPropertyDescriptor(object, name);
-  if (__DEV__ && descriptor) {
-    const backupName = `original${name[0].toUpperCase()}${name.substr(1)}`;
-    Object.defineProperty(object, backupName, {
-      ...descriptor,
-      value: object[name],
-    });
-  }
-
-  const {enumerable, writable, configurable} = descriptor || {};
-  if (descriptor && !configurable) {
-    console.error('Failed to set polyfill. ' + name + ' is not configurable.');
-    return;
-  }
-
-  defineLazyObjectProperty(object, name, {
-    get: getValue,
-    enumerable: enumerable !== false,
-    writable: writable !== false,
-  });
-}
-
-function polyfillGlobal<T>(name: string, getValue: () => T): void {
-  defineLazyProperty(global, name, getValue);
-}
-
 // Set up process
 global.process = global.process || {};
 global.process.env = global.process.env || {};
@@ -100,7 +54,7 @@ if (!global.process.env.NODE_ENV) {
 // Setup the Systrace profiling hooks if necessary
 if (global.__RCTProfileIsProfiling) {
   const Systrace = require('Systrace');
-  Systrace.installReactHook(true);
+  Systrace.installReactHook();
   Systrace.setEnabled(true);
 }
 
@@ -191,8 +145,8 @@ if (navigator === undefined) {
 }
 
 // see https://github.com/facebook/react-native/issues/10881
-defineLazyProperty(navigator, 'product', () => 'ReactNative');
-defineLazyProperty(navigator, 'geolocation', () => require('Geolocation'));
+polyfillObjectProperty(navigator, 'product', () => 'ReactNative');
+polyfillObjectProperty(navigator, 'geolocation', () => require('Geolocation'));
 
 // Just to make sure the JS gets packaged up. Wait until the JS environment has
 // been initialized before requiring them.
@@ -207,7 +161,7 @@ BatchedBridge.registerLazyCallableModule('RCTNativeAppEventEmitter', () => requi
 BatchedBridge.registerLazyCallableModule('PerformanceLogger', () => require('PerformanceLogger'));
 BatchedBridge.registerLazyCallableModule('JSDevSupportModule', () => require('JSDevSupportModule'));
 
-global.fetchSegment = function(
+global.__fetchSegment = function(
   segmentId: number,
   callback: (?Error) => void,
 ) {
@@ -241,9 +195,6 @@ if (__DEV__) {
 
     // Set up inspector
     const JSInspector = require('JSInspector');
-    /* $FlowFixMe(>=0.56.0 site=react_native_oss) This comment suppresses an
-     * error found when Flow v0.56 was deployed. To see the error delete this
-     * comment and run Flow. */
     /* $FlowFixMe(>=0.56.0 site=react_native_fb,react_native_oss) This comment
      * suppresses an error found when Flow v0.56 was deployed. To see the error
      * delete this comment and run Flow. */
diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index 2f78126ef691a6..bc67d865d8eceb 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ReactNativeVersion
@@ -14,7 +12,7 @@
 
 exports.version = {
   major: 0,
-  minor: 0,
-  patch: 0,
+  minor: 55,
+  patch: 4,
   prerelease: null,
 };
diff --git a/Libraries/Core/ReactNativeVersionCheck.js b/Libraries/Core/ReactNativeVersionCheck.js
index 39c416118d896e..acbac3337baffd 100644
--- a/Libraries/Core/ReactNativeVersionCheck.js
+++ b/Libraries/Core/ReactNativeVersionCheck.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ReactNativeVersionCheck
  * @flow
diff --git a/Libraries/Core/Timers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js
index 6d8da69e866af8..5fae3408aa5158 100644
--- a/Libraries/Core/Timers/JSTimers.js
+++ b/Libraries/Core/Timers/JSTimers.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule JSTimers
  * @format
diff --git a/Libraries/Core/__mocks__/ErrorUtils.js b/Libraries/Core/__mocks__/ErrorUtils.js
index 2c9a98f5645247..2ab128040cffca 100644
--- a/Libraries/Core/__mocks__/ErrorUtils.js
+++ b/Libraries/Core/__mocks__/ErrorUtils.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // This mock only provides short-circuited methods of applyWithGuard and guard.
diff --git a/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js b/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
index 4cbe744fe08498..e5c8cefddf15bb 100644
--- a/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
+++ b/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+react_native
diff --git a/Libraries/EventEmitter/MissingNativeEventEmitterShim.js b/Libraries/EventEmitter/MissingNativeEventEmitterShim.js
index 04362de06ac789..d4abfc228a4ba1 100644
--- a/Libraries/EventEmitter/MissingNativeEventEmitterShim.js
+++ b/Libraries/EventEmitter/MissingNativeEventEmitterShim.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MissingNativeEventEmitterShim
  * @flow
diff --git a/Libraries/EventEmitter/NativeEventEmitter.js b/Libraries/EventEmitter/NativeEventEmitter.js
index 5c979600295b54..f453cbc5184e42 100644
--- a/Libraries/EventEmitter/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/NativeEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NativeEventEmitter
  * @flow
diff --git a/Libraries/EventEmitter/RCTDeviceEventEmitter.js b/Libraries/EventEmitter/RCTDeviceEventEmitter.js
index 01e2e0ac5d7741..57ce4fa08990c8 100644
--- a/Libraries/EventEmitter/RCTDeviceEventEmitter.js
+++ b/Libraries/EventEmitter/RCTDeviceEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTDeviceEventEmitter
  * @flow
diff --git a/Libraries/EventEmitter/RCTEventEmitter.js b/Libraries/EventEmitter/RCTEventEmitter.js
index 76200db890f062..581515482f1c9b 100644
--- a/Libraries/EventEmitter/RCTEventEmitter.js
+++ b/Libraries/EventEmitter/RCTEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTEventEmitter
  * @flow
diff --git a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
index a940a6ec25bfc8..9fe0a1573fe18f 100644
--- a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
+++ b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTNativeAppEventEmitter
  * @flow
diff --git a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
index e2aa9526571b63..d65243424b4a50 100644
--- a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/Libraries/Experimental/Incremental.js b/Libraries/Experimental/Incremental.js
index c0d486eb021c31..45c0a7dce5a071 100644
--- a/Libraries/Experimental/Incremental.js
+++ b/Libraries/Experimental/Incremental.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Incremental
  * @flow
diff --git a/Libraries/Experimental/IncrementalExample.js b/Libraries/Experimental/IncrementalExample.js
index 13272627fb5838..280d36f198cfa0 100644
--- a/Libraries/Experimental/IncrementalExample.js
+++ b/Libraries/Experimental/IncrementalExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule IncrementalExample
  * @flow
diff --git a/Libraries/Experimental/IncrementalGroup.js b/Libraries/Experimental/IncrementalGroup.js
index 81714929afe351..e2aefae6836f2d 100644
--- a/Libraries/Experimental/IncrementalGroup.js
+++ b/Libraries/Experimental/IncrementalGroup.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule IncrementalGroup
  * @flow
diff --git a/Libraries/Experimental/IncrementalPresenter.js b/Libraries/Experimental/IncrementalPresenter.js
index 8f273974c20acf..03c69d1fcdcf71 100644
--- a/Libraries/Experimental/IncrementalPresenter.js
+++ b/Libraries/Experimental/IncrementalPresenter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule IncrementalPresenter
  * @flow
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js b/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js
index 6aa7c253ae6ee6..f7f78b40103acf 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableFlatList
  * @flow
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListView.js b/Libraries/Experimental/SwipeableRow/SwipeableListView.js
index 1daf0a1e483c3e..569f3581d04770 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableListView.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableListView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableListView
  * @flow
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
index 4fc44549688e2b..bda3bd3b530651 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableListViewDataSource
  */
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
index 59cccbe3d85869..315b8a2f64c389 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableQuickActionButton
  * @flow
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
index c5e53d55e80db4..96fe1d23daab47 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableQuickActions
  * @flow
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableRow.js b/Libraries/Experimental/SwipeableRow/SwipeableRow.js
index 18c5bbd0eff93c..80e627376e8482 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableRow.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableRow.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableRow
  * @flow
@@ -24,9 +22,6 @@ const TimerMixin = require('react-timer-mixin');
 const View = require('View');
 
 const createReactClass = require('create-react-class');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const emptyFunction = require('fbjs/lib/emptyFunction');
 
 const IS_RTL = I18nManager.isRTL;
diff --git a/Libraries/Experimental/WindowedListView.js b/Libraries/Experimental/WindowedListView.js
index a457bea4ed3d2d..2a102b23f3c47c 100644
--- a/Libraries/Experimental/WindowedListView.js
+++ b/Libraries/Experimental/WindowedListView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WindowedListView
  * @flow
diff --git a/Libraries/Geolocation/Geolocation.js b/Libraries/Geolocation/Geolocation.js
index d387b83e47076f..a4efe4c0201cb5 100644
--- a/Libraries/Geolocation/Geolocation.js
+++ b/Libraries/Geolocation/Geolocation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Geolocation
  * @flow
@@ -65,7 +63,7 @@ var Geolocation = {
 
   /*
    * Request suitable Location permission based on the key configured on pList.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/geolocation.html#requestauthorization
    */
   requestAuthorization: function() {
@@ -73,8 +71,8 @@ var Geolocation = {
   },
 
   /*
-   * Invokes the success callback once with the latest location info. 
-   * 
+   * Invokes the success callback once with the latest location info.
+   *
    * See https://facebook.github.io/react-native/docs/geolocation.html#getcurrentposition
    */
   getCurrentPosition: async function(
@@ -111,7 +109,7 @@ var Geolocation = {
 
   /*
    * Invokes the success callback whenever the location changes.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/geolocation.html#watchposition
    */
   watchPosition: function(success: Function, error?: Function, options?: GeoOptions): number {
diff --git a/Libraries/Geolocation/RCTLocationObserver.h b/Libraries/Geolocation/RCTLocationObserver.h
index 631bdf1cc80bdd..5de0ea289d881d 100644
--- a/Libraries/Geolocation/RCTLocationObserver.h
+++ b/Libraries/Geolocation/RCTLocationObserver.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/Libraries/Geolocation/RCTLocationObserver.m b/Libraries/Geolocation/RCTLocationObserver.m
index 11b344a6f46cf1..9e15facfa7ef68 100644
--- a/Libraries/Geolocation/RCTLocationObserver.m
+++ b/Libraries/Geolocation/RCTLocationObserver.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLocationObserver.h"
diff --git a/Libraries/Image/AssetRegistry.js b/Libraries/Image/AssetRegistry.js
index 4871fe370f70fd..7dabcfb9b53561 100644
--- a/Libraries/Image/AssetRegistry.js
+++ b/Libraries/Image/AssetRegistry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AssetRegistry
  * @flow
diff --git a/Libraries/Image/AssetSourceResolver.js b/Libraries/Image/AssetSourceResolver.js
index db7f642b862d0b..819353e03846ea 100644
--- a/Libraries/Image/AssetSourceResolver.js
+++ b/Libraries/Image/AssetSourceResolver.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AssetSourceResolver
  * @flow
@@ -12,13 +10,13 @@
  */
 'use strict';
 
-export type ResolvedAssetSource = {
-  __packager_asset: boolean,
-  width: ?number,
-  height: ?number,
-  uri: string,
-  scale: number,
-};
+export type ResolvedAssetSource = {|
+  +__packager_asset: boolean,
+  +width: ?number,
+  +height: ?number,
+  +uri: string,
+  +scale: number,
+|};
 
 import type {PackagerAsset} from 'AssetRegistry';
 
diff --git a/Libraries/Image/Image.android.js b/Libraries/Image/Image.android.js
index d3dec7a8adfb76..bdb29ab8fe8965 100644
--- a/Libraries/Image/Image.android.js
+++ b/Libraries/Image/Image.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Image
  * @flow
diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js
index 45b17d37229e04..173d78704f6610 100644
--- a/Libraries/Image/Image.ios.js
+++ b/Libraries/Image/Image.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Image
  * @flow
diff --git a/Libraries/Image/ImageBackground.js b/Libraries/Image/ImageBackground.js
index 13f4e2e9f85e1a..405bced59ce254 100644
--- a/Libraries/Image/ImageBackground.js
+++ b/Libraries/Image/ImageBackground.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageBackground
  * @flow
@@ -19,8 +17,6 @@ const View = require('View');
 
 const ensureComponentIsNative = require('ensureComponentIsNative');
 
-import type {NativeMethodsMixinType} from 'ReactNativeTypes';
-
 /**
  * Very simple drop-in replacement for <Image> which supports nesting views.
  *
@@ -55,7 +51,7 @@ class ImageBackground extends React.Component<$FlowFixMeProps> {
     }
   }
 
-  _viewRef: ?NativeMethodsMixinType = null;
+  _viewRef: ?React.ElementRef<typeof View> = null;
 
   _captureRef = ref => {
     this._viewRef = ref;
diff --git a/Libraries/Image/ImageEditor.js b/Libraries/Image/ImageEditor.js
index 90868c7736623e..ddd7fd381285c5 100644
--- a/Libraries/Image/ImageEditor.js
+++ b/Libraries/Image/ImageEditor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageEditor
  * @flow
diff --git a/Libraries/Image/ImageResizeMode.js b/Libraries/Image/ImageResizeMode.js
index 26c0029e247fa3..25d937d60efe5f 100644
--- a/Libraries/Image/ImageResizeMode.js
+++ b/Libraries/Image/ImageResizeMode.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageResizeMode
  * @flow
diff --git a/Libraries/Image/ImageSource.js b/Libraries/Image/ImageSource.js
index 59fa2c0174729a..533eb513219ca2 100644
--- a/Libraries/Image/ImageSource.js
+++ b/Libraries/Image/ImageSource.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageSource
  * @flow
diff --git a/Libraries/Image/ImageSourcePropType.js b/Libraries/Image/ImageSourcePropType.js
index 3ace885f6e15ad..af9dac3c479477 100644
--- a/Libraries/Image/ImageSourcePropType.js
+++ b/Libraries/Image/ImageSourcePropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageSourcePropType
  * @no-flow
diff --git a/Libraries/Image/ImageStore.js b/Libraries/Image/ImageStore.js
index 6eb06418eebd91..215bdec246cb1e 100644
--- a/Libraries/Image/ImageStore.js
+++ b/Libraries/Image/ImageStore.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageStore
  * @flow
diff --git a/Libraries/Image/ImageStylePropTypes.js b/Libraries/Image/ImageStylePropTypes.js
index 2953b81ab7156f..9a688ac7f9d425 100644
--- a/Libraries/Image/ImageStylePropTypes.js
+++ b/Libraries/Image/ImageStylePropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageStylePropTypes
  * @flow
diff --git a/Libraries/Image/RCTGIFImageDecoder.h b/Libraries/Image/RCTGIFImageDecoder.h
index 01128297c39cb5..1f942aef4c8ce6 100644
--- a/Libraries/Image/RCTGIFImageDecoder.h
+++ b/Libraries/Image/RCTGIFImageDecoder.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTImageLoader.h>
diff --git a/Libraries/Image/RCTGIFImageDecoder.m b/Libraries/Image/RCTGIFImageDecoder.m
index e9777bec16a5e6..48ca8aefcf74b4 100644
--- a/Libraries/Image/RCTGIFImageDecoder.m
+++ b/Libraries/Image/RCTGIFImageDecoder.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTGIFImageDecoder.h"
diff --git a/Libraries/Image/RCTImageBlurUtils.h b/Libraries/Image/RCTImageBlurUtils.h
index db8c90943789fa..44df37441af92a 100644
--- a/Libraries/Image/RCTImageBlurUtils.h
+++ b/Libraries/Image/RCTImageBlurUtils.h
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/Image/RCTImageBlurUtils.m b/Libraries/Image/RCTImageBlurUtils.m
index 193c042770a12e..84c90019bfbcc9 100644
--- a/Libraries/Image/RCTImageBlurUtils.m
+++ b/Libraries/Image/RCTImageBlurUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageBlurUtils.h"
diff --git a/Libraries/Image/RCTImageCache.h b/Libraries/Image/RCTImageCache.h
index b0cf1b69257703..c0d24ad25a2d41 100644
--- a/Libraries/Image/RCTImageCache.h
+++ b/Libraries/Image/RCTImageCache.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/Image/RCTImageCache.m b/Libraries/Image/RCTImageCache.m
index ed825f00c13997..8caedae7cf8186 100644
--- a/Libraries/Image/RCTImageCache.m
+++ b/Libraries/Image/RCTImageCache.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageCache.h"
diff --git a/Libraries/Image/RCTImageEditingManager.h b/Libraries/Image/RCTImageEditingManager.h
index e2d87600dba37c..dda409af33fc22 100644
--- a/Libraries/Image/RCTImageEditingManager.h
+++ b/Libraries/Image/RCTImageEditingManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/Libraries/Image/RCTImageEditingManager.m b/Libraries/Image/RCTImageEditingManager.m
index 89341f652646c4..2c8330ee9a302b 100644
--- a/Libraries/Image/RCTImageEditingManager.m
+++ b/Libraries/Image/RCTImageEditingManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageEditingManager.h"
diff --git a/Libraries/Image/RCTImageLoader.h b/Libraries/Image/RCTImageLoader.h
index 5326845ee69ac4..a0c6e798a8a960 100644
--- a/Libraries/Image/RCTImageLoader.h
+++ b/Libraries/Image/RCTImageLoader.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Image/RCTImageLoader.m b/Libraries/Image/RCTImageLoader.m
index 8b5b96c7bc70d3..bc50fb03a0eaca 100644
--- a/Libraries/Image/RCTImageLoader.m
+++ b/Libraries/Image/RCTImageLoader.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <stdatomic.h>
diff --git a/Libraries/Image/RCTImageShadowView.h b/Libraries/Image/RCTImageShadowView.h
index 292a790748ec28..168f0f4c1de86d 100644
--- a/Libraries/Image/RCTImageShadowView.h
+++ b/Libraries/Image/RCTImageShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/Libraries/Image/RCTImageShadowView.m b/Libraries/Image/RCTImageShadowView.m
index 3dc16c4f0d0f5e..c9ba82e32188cc 100644
--- a/Libraries/Image/RCTImageShadowView.m
+++ b/Libraries/Image/RCTImageShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageShadowView.h"
diff --git a/Libraries/Image/RCTImageStoreManager.h b/Libraries/Image/RCTImageStoreManager.h
index 2bdffbe3051acd..3f070ada1d27be 100644
--- a/Libraries/Image/RCTImageStoreManager.h
+++ b/Libraries/Image/RCTImageStoreManager.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Image/RCTImageStoreManager.m b/Libraries/Image/RCTImageStoreManager.m
index 87fe71387eac14..443885becfff2e 100644
--- a/Libraries/Image/RCTImageStoreManager.m
+++ b/Libraries/Image/RCTImageStoreManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageStoreManager.h"
diff --git a/Libraries/Image/RCTImageUtils.h b/Libraries/Image/RCTImageUtils.h
index 371770cb1b92cd..d6090ac67ffb48 100644
--- a/Libraries/Image/RCTImageUtils.h
+++ b/Libraries/Image/RCTImageUtils.h
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/Image/RCTImageUtils.m b/Libraries/Image/RCTImageUtils.m
index f64f1f7b686887..52fe3893307307 100644
--- a/Libraries/Image/RCTImageUtils.m
+++ b/Libraries/Image/RCTImageUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageUtils.h"
diff --git a/Libraries/Image/RCTImageView.h b/Libraries/Image/RCTImageView.h
index 7c632b3bfa66a1..70357c359b142e 100644
--- a/Libraries/Image/RCTImageView.h
+++ b/Libraries/Image/RCTImageView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Image/RCTImageView.m b/Libraries/Image/RCTImageView.m
index 144fff6cbff33c..a754bb1078dc3b 100644
--- a/Libraries/Image/RCTImageView.m
+++ b/Libraries/Image/RCTImageView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageView.h"
diff --git a/Libraries/Image/RCTImageViewManager.h b/Libraries/Image/RCTImageViewManager.h
index 60ba85df174fa2..f718a70246ef41 100644
--- a/Libraries/Image/RCTImageViewManager.h
+++ b/Libraries/Image/RCTImageViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/Image/RCTImageViewManager.m b/Libraries/Image/RCTImageViewManager.m
index b313e016fd3094..bd382e4bf191d0 100644
--- a/Libraries/Image/RCTImageViewManager.m
+++ b/Libraries/Image/RCTImageViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageViewManager.h"
diff --git a/Libraries/Image/RCTLocalAssetImageLoader.h b/Libraries/Image/RCTLocalAssetImageLoader.h
index 011484f2d800aa..4cd79bd403c5a2 100644
--- a/Libraries/Image/RCTLocalAssetImageLoader.h
+++ b/Libraries/Image/RCTLocalAssetImageLoader.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTImageLoader.h>
diff --git a/Libraries/Image/RCTLocalAssetImageLoader.m b/Libraries/Image/RCTLocalAssetImageLoader.m
index 7186f9aa59bf51..091cd70e0eafef 100644
--- a/Libraries/Image/RCTLocalAssetImageLoader.m
+++ b/Libraries/Image/RCTLocalAssetImageLoader.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLocalAssetImageLoader.h"
diff --git a/Libraries/Image/RCTResizeMode.h b/Libraries/Image/RCTResizeMode.h
index 52f888073894d6..ce0fba5e31afad 100644
--- a/Libraries/Image/RCTResizeMode.h
+++ b/Libraries/Image/RCTResizeMode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/Libraries/Image/RCTResizeMode.m b/Libraries/Image/RCTResizeMode.m
index 6142fc6ab1fb73..1094b7ff96e8c9 100644
--- a/Libraries/Image/RCTResizeMode.m
+++ b/Libraries/Image/RCTResizeMode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTResizeMode.h"
diff --git a/Libraries/Image/RelativeImageStub.js b/Libraries/Image/RelativeImageStub.js
index 37984d7ff217d8..4adf66b806b4f2 100644
--- a/Libraries/Image/RelativeImageStub.js
+++ b/Libraries/Image/RelativeImageStub.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RelativeImageStub
  * @flow
diff --git a/Libraries/Image/__tests__/assetRelativePathInSnapshot.js b/Libraries/Image/__tests__/assetRelativePathInSnapshot.js
index c0c0b96c89525e..262e636b4710ff 100644
--- a/Libraries/Image/__tests__/assetRelativePathInSnapshot.js
+++ b/Libraries/Image/__tests__/assetRelativePathInSnapshot.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Image/__tests__/resolveAssetSource-test.js b/Libraries/Image/__tests__/resolveAssetSource-test.js
index bf0507d752bb92..50a666a5b54897 100644
--- a/Libraries/Image/__tests__/resolveAssetSource-test.js
+++ b/Libraries/Image/__tests__/resolveAssetSource-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Image/nativeImageSource.js b/Libraries/Image/nativeImageSource.js
index 66af917254bf7c..26b194ace776be 100644
--- a/Libraries/Image/nativeImageSource.js
+++ b/Libraries/Image/nativeImageSource.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule nativeImageSource
  * @flow
diff --git a/Libraries/Image/resolveAssetSource.js b/Libraries/Image/resolveAssetSource.js
index cabed0a0a69621..24fec6ef33c78a 100644
--- a/Libraries/Image/resolveAssetSource.js
+++ b/Libraries/Image/resolveAssetSource.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule resolveAssetSource
  * @flow
@@ -94,7 +92,7 @@ if (!sourceCode) {
   const NativeModules = require('NativeModules');
   sourceCode = NativeModules && NativeModules.SourceCode;
 }
-_sourceCodeScriptURL = sourceCode.scriptURL;
+_sourceCodeScriptURL = sourceCode && sourceCode.scriptURL;
 
 module.exports = resolveAssetSource;
 module.exports.pickScale = AssetSourceResolver.pickScale;
diff --git a/Libraries/Inspector/BorderBox.js b/Libraries/Inspector/BorderBox.js
index 782c7c2e02bf6c..c121de5ea1dabb 100644
--- a/Libraries/Inspector/BorderBox.js
+++ b/Libraries/Inspector/BorderBox.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BorderBox
  * @flow
diff --git a/Libraries/Inspector/BoxInspector.js b/Libraries/Inspector/BoxInspector.js
index 2b4c2786cc870e..31bedeecdaa0c8 100644
--- a/Libraries/Inspector/BoxInspector.js
+++ b/Libraries/Inspector/BoxInspector.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BoxInspector
  * @flow
diff --git a/Libraries/Inspector/ElementBox.js b/Libraries/Inspector/ElementBox.js
index db4f7b8f0da818..b9caef093cc340 100644
--- a/Libraries/Inspector/ElementBox.js
+++ b/Libraries/Inspector/ElementBox.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ElementBox
  * @flow
diff --git a/Libraries/Inspector/ElementProperties.js b/Libraries/Inspector/ElementProperties.js
index 880dcb84d173b8..460e1c2df81059 100644
--- a/Libraries/Inspector/ElementProperties.js
+++ b/Libraries/Inspector/ElementProperties.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ElementProperties
  * @flow
@@ -25,11 +23,11 @@ const flattenStyle = require('flattenStyle');
 const mapWithSeparator = require('mapWithSeparator');
 const openFileInEditor = require('openFileInEditor');
 
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 
 class ElementProperties extends React.Component<{
   hierarchy: Array<$FlowFixMe>,
-  style?: StyleObj,
+  style?: DangerouslyImpreciseStyleProp,
   source?: {
     fileName?: string,
     lineNumber?: number,
diff --git a/Libraries/Inspector/Inspector.js b/Libraries/Inspector/Inspector.js
index 3eb6682f2bd97c..963b616fca3bcb 100644
--- a/Libraries/Inspector/Inspector.js
+++ b/Libraries/Inspector/Inspector.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Inspector
  * @flow
@@ -34,15 +32,26 @@ export type ReactRenderer = {
 };
 
 const hook = window.__REACT_DEVTOOLS_GLOBAL_HOOK__;
-const renderer: ReactRenderer = findRenderer();
+const renderers = findRenderers();
+
 // required for devtools to be able to edit react native styles
 hook.resolveRNStyle = require('flattenStyle');
 
-function findRenderer(): ReactRenderer {
-  const renderers = hook._renderers;
-  const keys = Object.keys(renderers);
-  invariant(keys.length === 1, 'Expected to find exactly one React Native renderer on DevTools hook.');
-  return renderers[keys[0]];
+function findRenderers(): $ReadOnlyArray<ReactRenderer> {
+  const allRenderers = Object.keys(hook._renderers).map(key => hook._renderers[key]);
+  invariant(allRenderers.length >= 1, 'Expected to find at least one React Native renderer on DevTools hook.');
+  return allRenderers;
+}
+
+function getInspectorDataForViewTag(touchedViewTag: number) {
+  for (let i = 0; i < renderers.length; i++) {
+    const renderer = renderers[i];
+    const inspectorData = renderer.getInspectorDataForViewTag(touchedViewTag);
+    if (inspectorData.hierarchy.length > 0) {
+      return inspectorData;
+    }
+  }
+  throw new Error('Expected to find at least one React renderer.');
 }
 
 class Inspector extends React.Component<{
@@ -172,7 +181,7 @@ class Inspector extends React.Component<{
       props,
       selection,
       source,
-    } = renderer.getInspectorDataForViewTag(touchedViewTag);
+    } = getInspectorDataForViewTag(touchedViewTag);
 
     if (this.state.devtoolsAgent) {
       // Skip host leafs
diff --git a/Libraries/Inspector/InspectorOverlay.js b/Libraries/Inspector/InspectorOverlay.js
index 716c0e1a7d62b2..d441ba59884ea9 100644
--- a/Libraries/Inspector/InspectorOverlay.js
+++ b/Libraries/Inspector/InspectorOverlay.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InspectorOverlay
  * @flow
diff --git a/Libraries/Inspector/InspectorPanel.js b/Libraries/Inspector/InspectorPanel.js
index a37b37f8ef2885..c4031a355d5c45 100644
--- a/Libraries/Inspector/InspectorPanel.js
+++ b/Libraries/Inspector/InspectorPanel.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InspectorPanel
  * @flow
diff --git a/Libraries/Inspector/NetworkOverlay.js b/Libraries/Inspector/NetworkOverlay.js
index db0216a0059e82..789ac6de824c65 100644
--- a/Libraries/Inspector/NetworkOverlay.js
+++ b/Libraries/Inspector/NetworkOverlay.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NetworkOverlay
  * @flow
diff --git a/Libraries/Inspector/PerformanceOverlay.js b/Libraries/Inspector/PerformanceOverlay.js
index c6c6f1c023e1eb..8240a43244ac6b 100644
--- a/Libraries/Inspector/PerformanceOverlay.js
+++ b/Libraries/Inspector/PerformanceOverlay.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PerformanceOverlay
  * @flow
diff --git a/Libraries/Inspector/StyleInspector.js b/Libraries/Inspector/StyleInspector.js
index 192d7b93fc4e77..7bd137bdea7de6 100644
--- a/Libraries/Inspector/StyleInspector.js
+++ b/Libraries/Inspector/StyleInspector.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StyleInspector
  * @flow
diff --git a/Libraries/Inspector/resolveBoxStyle.js b/Libraries/Inspector/resolveBoxStyle.js
index 0c2857bd0e658b..28f4af50525b33 100644
--- a/Libraries/Inspector/resolveBoxStyle.js
+++ b/Libraries/Inspector/resolveBoxStyle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule resolveBoxStyle
  * @flow
diff --git a/Libraries/Interaction/Batchinator.js b/Libraries/Interaction/Batchinator.js
index e807e5515e7f81..3f3b4e069a019e 100644
--- a/Libraries/Interaction/Batchinator.js
+++ b/Libraries/Interaction/Batchinator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Batchinator
  * @flow
diff --git a/Libraries/Interaction/BridgeSpyStallHandler.js b/Libraries/Interaction/BridgeSpyStallHandler.js
index 78d61c0321baae..f47f0751d8ad67 100644
--- a/Libraries/Interaction/BridgeSpyStallHandler.js
+++ b/Libraries/Interaction/BridgeSpyStallHandler.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BridgeSpyStallHandler
  * @flow
diff --git a/Libraries/Interaction/FrameRateLogger.js b/Libraries/Interaction/FrameRateLogger.js
index 3f1265b4140b03..072adeb930f8d8 100644
--- a/Libraries/Interaction/FrameRateLogger.js
+++ b/Libraries/Interaction/FrameRateLogger.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FrameRateLogger
  * @flow
diff --git a/Libraries/Interaction/InteractionManager.js b/Libraries/Interaction/InteractionManager.js
index 489c5de9148f5f..227e1b05bd3a73 100644
--- a/Libraries/Interaction/InteractionManager.js
+++ b/Libraries/Interaction/InteractionManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InteractionManager
  * @flow
diff --git a/Libraries/Interaction/InteractionMixin.js b/Libraries/Interaction/InteractionMixin.js
index b0e3104407ea36..9e81a4fddaec1e 100644
--- a/Libraries/Interaction/InteractionMixin.js
+++ b/Libraries/Interaction/InteractionMixin.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InteractionMixin
  * @flow
diff --git a/Libraries/Interaction/InteractionStallDebugger.js b/Libraries/Interaction/InteractionStallDebugger.js
index 782abbf7edaeaf..8d2bcc82e5f9ba 100644
--- a/Libraries/Interaction/InteractionStallDebugger.js
+++ b/Libraries/Interaction/InteractionStallDebugger.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InteractionStallDebugger
  * @flow
diff --git a/Libraries/Interaction/JSEventLoopWatchdog.js b/Libraries/Interaction/JSEventLoopWatchdog.js
index 702f18d6c1d70b..2d1866a0c77f2f 100644
--- a/Libraries/Interaction/JSEventLoopWatchdog.js
+++ b/Libraries/Interaction/JSEventLoopWatchdog.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule JSEventLoopWatchdog
  * @flow
diff --git a/Libraries/Interaction/PanResponder.js b/Libraries/Interaction/PanResponder.js
index bc6774e985eb66..db7d85c87e2714 100644
--- a/Libraries/Interaction/PanResponder.js
+++ b/Libraries/Interaction/PanResponder.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PanResponder
  */
diff --git a/Libraries/Interaction/ReactPerfStallHandler.js b/Libraries/Interaction/ReactPerfStallHandler.js
index 0644ace6af5eeb..394bc7533ca1c7 100644
--- a/Libraries/Interaction/ReactPerfStallHandler.js
+++ b/Libraries/Interaction/ReactPerfStallHandler.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ReactPerfStallHandler
  * @flow
diff --git a/Libraries/Interaction/TaskQueue.js b/Libraries/Interaction/TaskQueue.js
index 660241fb35bc5a..0ee5e4500af9f0 100644
--- a/Libraries/Interaction/TaskQueue.js
+++ b/Libraries/Interaction/TaskQueue.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TaskQueue
  * @flow
diff --git a/Libraries/Interaction/__tests__/Batchinator-test.js b/Libraries/Interaction/__tests__/Batchinator-test.js
index 3d28fa0cff5c5e..a0afacd4e0d0cd 100644
--- a/Libraries/Interaction/__tests__/Batchinator-test.js
+++ b/Libraries/Interaction/__tests__/Batchinator-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Interaction/__tests__/InteractionManager-test.js b/Libraries/Interaction/__tests__/InteractionManager-test.js
index 3c5a7c8814ebb6..0a74b7cc766485 100644
--- a/Libraries/Interaction/__tests__/InteractionManager-test.js
+++ b/Libraries/Interaction/__tests__/InteractionManager-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Interaction/__tests__/InteractionMixin-test.js b/Libraries/Interaction/__tests__/InteractionMixin-test.js
index 44f63fbb9c828f..08f33d759f5016 100644
--- a/Libraries/Interaction/__tests__/InteractionMixin-test.js
+++ b/Libraries/Interaction/__tests__/InteractionMixin-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Interaction/__tests__/TaskQueue-test.js b/Libraries/Interaction/__tests__/TaskQueue-test.js
index cd4f7aeed412cc..407e8fa435cd0b 100644
--- a/Libraries/Interaction/__tests__/TaskQueue-test.js
+++ b/Libraries/Interaction/__tests__/TaskQueue-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/JSInspector/InspectorAgent.js b/Libraries/JSInspector/InspectorAgent.js
index c0d9314a3baec0..a5b6cca0da3da3 100644
--- a/Libraries/JSInspector/InspectorAgent.js
+++ b/Libraries/JSInspector/InspectorAgent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InspectorAgent
  * @flow
diff --git a/Libraries/JSInspector/JSInspector.js b/Libraries/JSInspector/JSInspector.js
index 859188420c8642..9a6b13ffb7c690 100644
--- a/Libraries/JSInspector/JSInspector.js
+++ b/Libraries/JSInspector/JSInspector.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule JSInspector
  * @flow
diff --git a/Libraries/JSInspector/NetworkAgent.js b/Libraries/JSInspector/NetworkAgent.js
index 4314411b8e0076..56f6f2a37fdccf 100644
--- a/Libraries/JSInspector/NetworkAgent.js
+++ b/Libraries/JSInspector/NetworkAgent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NetworkAgent
  * @flow
diff --git a/Libraries/LayoutAnimation/LayoutAnimation.js b/Libraries/LayoutAnimation/LayoutAnimation.js
index dc0720ba09b2da..fe4a2cc2b84328 100644
--- a/Libraries/LayoutAnimation/LayoutAnimation.js
+++ b/Libraries/LayoutAnimation/LayoutAnimation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LayoutAnimation
  * @flow
diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js
index 06dc75c3b9eef8..a621e647adccf8 100644
--- a/Libraries/Linking/Linking.js
+++ b/Libraries/Linking/Linking.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Linking
  * @flow
@@ -23,7 +21,7 @@ const LinkingManager = Platform.OS === 'android' ?
 /**
  * `Linking` gives you a general interface to interact with both incoming
  * and outgoing app links.
- * 
+ *
  * See https://facebook.github.io/react-native/docs/linking.html
  */
 class Linking extends NativeEventEmitter {
@@ -35,7 +33,7 @@ class Linking extends NativeEventEmitter {
   /**
    * Add a handler to Linking changes by listening to the `url` event type
    * and providing the handler
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/linking.html#addeventlistener
    */
   addEventListener(type: string, handler: Function) {
@@ -44,7 +42,7 @@ class Linking extends NativeEventEmitter {
 
   /**
    * Remove a handler by passing the `url` event type and the handler.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/linking.html#removeeventlistener
    */
   removeEventListener(type: string, handler: Function ) {
diff --git a/Libraries/LinkingIOS/RCTLinkingManager.h b/Libraries/LinkingIOS/RCTLinkingManager.h
index 8f5f8b89aa7b27..55187727ac95d2 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.h
+++ b/Libraries/LinkingIOS/RCTLinkingManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/LinkingIOS/RCTLinkingManager.m b/Libraries/LinkingIOS/RCTLinkingManager.m
index 51a2896cfe4943..50982fa976d669 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.m
+++ b/Libraries/LinkingIOS/RCTLinkingManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLinkingManager.h"
diff --git a/Libraries/Lists/FillRateHelper.js b/Libraries/Lists/FillRateHelper.js
index 8d52111e1cdbab..f060897356b73a 100644
--- a/Libraries/Lists/FillRateHelper.js
+++ b/Libraries/Lists/FillRateHelper.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FillRateHelper
  * @flow
diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index faf93d859c47d3..13b87ed995b756 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FlatList
  * @flow
@@ -20,7 +18,7 @@ const ListView = require('ListView');
 
 const invariant = require('fbjs/lib/invariant');
 
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 import type {
   ViewabilityConfig,
   ViewToken,
@@ -98,7 +96,7 @@ type OptionalProps<ItemT> = {
   /**
    * Optional custom style for multi-item rows generated when numColumns > 1.
    */
-  columnWrapperStyle?: StyleObj,
+  columnWrapperStyle?: DangerouslyImpreciseStyleProp,
   /**
    * A marker property for telling the list to re-render (since it implements `PureComponent`). If
    * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the
@@ -629,8 +627,14 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   render() {
     if (this.props.legacyImplementation) {
       return (
+        /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses an
+         * error found when Flow v0.66 was deployed. To see the error delete
+         * this comment and run Flow. */
         <MetroListView
           {...this.props}
+          /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses
+           * an error found when Flow v0.66 was deployed. To see the error
+           * delete this comment and run Flow. */
           items={this.props.data}
           ref={this._captureRef}
         />
diff --git a/Libraries/Lists/ListView/ListView.js b/Libraries/Lists/ListView/ListView.js
index 37c3f34cc21fc5..9aefd2ea9222b3 100644
--- a/Libraries/Lists/ListView/ListView.js
+++ b/Libraries/Lists/ListView/ListView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ListView
  * @flow
diff --git a/Libraries/Lists/ListView/ListViewDataSource.js b/Libraries/Lists/ListView/ListViewDataSource.js
index 3f7a4c10d64cb2..ec63c94d0f46dd 100644
--- a/Libraries/Lists/ListView/ListViewDataSource.js
+++ b/Libraries/Lists/ListView/ListViewDataSource.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ListViewDataSource
  * @flow
diff --git a/Libraries/Lists/ListView/__mocks__/ListViewMock.js b/Libraries/Lists/ListView/__mocks__/ListViewMock.js
index 732dc5e1caf208..a691136be39a4f 100644
--- a/Libraries/Lists/ListView/__mocks__/ListViewMock.js
+++ b/Libraries/Lists/ListView/__mocks__/ListViewMock.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/Libraries/Lists/MetroListView.js b/Libraries/Lists/MetroListView.js
index c839dc020ed346..5f22eb264ee85b 100644
--- a/Libraries/Lists/MetroListView.js
+++ b/Libraries/Lists/MetroListView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MetroListView
  * @flow
@@ -52,8 +50,6 @@ type NormalProps = {
 type DefaultProps = {
   keyExtractor: (item: Item, index: number) => string,
 };
-/* $FlowFixMe - the renderItem passed in from SectionList is optional there but
- * required here */
 type Props = NormalProps & DefaultProps;
 
 /**
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index 354d6c6a426707..2404d26f54c72a 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SectionList
  * @flow
@@ -328,6 +326,9 @@ class SectionList<SectionT: SectionBase<any>> extends React.PureComponent<
     const List = this.props.legacyImplementation
       ? MetroListView
       : VirtualizedSectionList;
+    /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses an
+     * error found when Flow v0.66 was deployed. To see the error delete this
+     * comment and run Flow. */
     return <List {...this.props} ref={this._captureRef} />;
   }
 
diff --git a/Libraries/Lists/ViewabilityHelper.js b/Libraries/Lists/ViewabilityHelper.js
index 04bbef2f06e5fe..0c0a8356019075 100644
--- a/Libraries/Lists/ViewabilityHelper.js
+++ b/Libraries/Lists/ViewabilityHelper.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewabilityHelper
  * @flow
diff --git a/Libraries/Lists/VirtualizeUtils.js b/Libraries/Lists/VirtualizeUtils.js
index 8845ed83566f16..663b36b8cc6e76 100644
--- a/Libraries/Lists/VirtualizeUtils.js
+++ b/Libraries/Lists/VirtualizeUtils.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule VirtualizeUtils
  * @flow
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 22fffa79cc2adf..871d3a065ecf15 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule VirtualizedList
  * @flow
@@ -34,7 +32,7 @@ const warning = require('fbjs/lib/warning');
 
 const {computeWindowedRenderLimits} = require('VirtualizeUtils');
 
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 import type {
   ViewabilityConfig,
   ViewToken,
@@ -54,7 +52,9 @@ type ViewabilityHelperCallbackTuple = {
 };
 
 type RequiredProps = {
-  renderItem: renderItemType,
+  // TODO: Conflicts with the optional `renderItem` in
+  // `VirtualizedSectionList`'s props.
+  renderItem: $FlowFixMe<renderItemType>,
   /**
    * The default accessor functions assume this is an Array<{key: string}> but you can override
    * getItem, getItemCount, and keyExtractor to handle any type of index-based data.
@@ -442,6 +442,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       getScrollMetrics: PropTypes.func,
       horizontal: PropTypes.bool,
       getOutermostParentListRef: PropTypes.func,
+      getNestedChildState: PropTypes.func,
       registerAsNestedChild: PropTypes.func,
       unregisterAsNestedChild: PropTypes.func,
     }),
@@ -452,6 +453,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       getScrollMetrics: PropTypes.func,
       horizontal: PropTypes.bool,
       getOutermostParentListRef: PropTypes.func,
+      getNestedChildState: PropTypes.func,
       registerAsNestedChild: PropTypes.func,
       unregisterAsNestedChild: PropTypes.func,
     }),
@@ -463,6 +465,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         getScrollMetrics: this._getScrollMetrics,
         horizontal: this.props.horizontal,
         getOutermostParentListRef: this._getOutermostParentListRef,
+        getNestedChildState: this._getNestedChildState,
         registerAsNestedChild: this._registerAsNestedChild,
         unregisterAsNestedChild: this._unregisterAsNestedChild,
       },
@@ -492,6 +495,11 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     }
   };
 
+  _getNestedChildState = (key: string): ?ChildListState => {
+    const existingChildData = this._nestedChildLists.get(key);
+    return existingChildData && existingChildData.state;
+  };
+
   _registerAsNestedChild = (childList: {
     cellKey: string,
     key: string,
@@ -518,8 +526,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     if (this._hasInteracted) {
       childList.ref.recordInteraction();
     }
-
-    return existingChildData && existingChildData.state;
   };
 
   _unregisterAsNestedChild = (childList: {
@@ -577,11 +583,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     };
 
     if (this._isNestedWithSameOrientation()) {
-      const storedState = this.context.virtualizedList.registerAsNestedChild({
-        cellKey: this._getCellKey(),
-        key: this.props.listKey || this._getCellKey(),
-        ref: this,
-      });
+      const storedState = this.context.virtualizedList.getNestedChildState(
+        this.props.listKey || this._getCellKey(),
+      );
       if (storedState) {
         initialState = storedState;
         this.state = storedState;
@@ -592,6 +596,16 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     this.state = initialState;
   }
 
+  componentDidMount() {
+    if (this._isNestedWithSameOrientation()) {
+      this.context.virtualizedList.registerAsNestedChild({
+        cellKey: this._getCellKey(),
+        key: this.props.listKey || this._getCellKey(),
+        ref: this,
+      });
+    }
+  }
+
   componentWillUnmount() {
     if (this._isNestedWithSameOrientation()) {
       this.context.virtualizedList.unregisterAsNestedChild({
@@ -611,29 +625,17 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     this._fillRateHelper.deactivateAndFlush();
   }
 
-  UNSAFE_componentWillReceiveProps(newProps: Props) {
+  static getDerivedStateFromProps(newProps: Props, prevState: State) {
     const {data, extraData, getItemCount, maxToRenderPerBatch} = newProps;
     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
     // sure we're rendering a reasonable range here.
-    this.setState({
+    return {
       first: Math.max(
         0,
-        Math.min(
-          this.state.first,
-          getItemCount(data) - 1 - maxToRenderPerBatch,
-        ),
+        Math.min(prevState.first, getItemCount(data) - 1 - maxToRenderPerBatch),
       ),
-      last: Math.max(0, Math.min(this.state.last, getItemCount(data) - 1)),
-    });
-    if (data !== this.props.data || extraData !== this.props.extraData) {
-      this._hasDataChangedSinceEndReached = true;
-
-      // clear the viewableIndices cache to also trigger
-      // the onViewableItemsChanged callback with the new data
-      this._viewabilityTuples.forEach(tuple => {
-        tuple.viewabilityHelper.resetViewableIndices();
-      });
-    }
+      last: Math.max(0, Math.min(prevState.last, getItemCount(data) - 1)),
+    };
   }
 
   _pushCells(
@@ -642,7 +644,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     stickyIndicesFromProps: Set<number>,
     first: number,
     last: number,
-    inversionStyle: ?StyleObj,
+    inversionStyle: ?DangerouslyImpreciseStyleProp,
   ) {
     const {
       CellRendererComponent,
@@ -746,6 +748,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           cellKey={this._getCellKey() + '-header'}
           key="$header">
           <View onLayout={this._onLayoutHeader} style={inversionStyle}>
+            {/*
+              Flow doesn't know this is a React.Element and not a React.Component
+              $FlowFixMe https://fburl.com/b9xmtm09
+            */}
             {element}
           </View>
         </VirtualizedCellWrapper>,
@@ -855,6 +861,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           key="$empty"
           onLayout={this._onLayoutEmpty}
           style={inversionStyle}>
+          {/*
+            Flow doesn't know this is a React.Element and not a React.Component
+            $FlowFixMe https://fburl.com/b9xmtm09
+          */}
           {element}
         </View>,
       );
@@ -871,6 +881,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           cellKey={this._getCellKey() + '-footer'}
           key="$footer">
           <View onLayout={this._onLayoutFooter} style={inversionStyle}>
+            {/*
+              Flow doesn't know this is a React.Element and not a React.Component
+              $FlowFixMe https://fburl.com/b9xmtm09
+            */}
             {element}
           </View>
         </VirtualizedCellWrapper>,
@@ -885,7 +899,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       onScrollEndDrag: this._onScrollEndDrag,
       onMomentumScrollEnd: this._onMomentumScrollEnd,
       scrollEventThrottle: this.props.scrollEventThrottle, // TODO: Android support
-      invertStickyHeaders: this.props.inverted,
+      invertStickyHeaders: this.props.invertStickyHeaders !== undefined
+        ? this.props.invertStickyHeaders
+        : this.props.inverted,	
       stickyHeaderIndices,
     };
     if (inversionStyle) {
@@ -916,7 +932,17 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     }
   }
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps: Props) {
+    const {data, extraData} = this.props;
+    if (data !== prevProps.data || extraData !== prevProps.extraData) {
+      this._hasDataChangedSinceEndReached = true;
+
+      // clear the viewableIndices cache to also trigger
+      // the onViewableItemsChanged callback with the new data
+      this._viewabilityTuples.forEach(tuple => {
+        tuple.viewabilityHelper.resetViewableIndices();
+      });
+    }
     this._scheduleCellsToRenderUpdate();
   }
 
@@ -950,7 +976,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     velocity: 0,
     visibleLength: 0,
   };
-  _scrollRef = (null: any);
+  _scrollRef: ?React.ElementRef<any> = null;
   _sentEndForContentLength = 0;
   _totalCellLength = 0;
   _totalCellsMeasured = 0;
@@ -1151,11 +1177,11 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     );
   }
 
-  _selectLength(metrics: {height: number, width: number}): number {
+  _selectLength(metrics: $ReadOnly<{height: number, width: number}>): number {
     return !this.props.horizontal ? metrics.height : metrics.width;
   }
 
-  _selectOffset(metrics: {x: number, y: number}): number {
+  _selectOffset(metrics: $ReadOnly<{x: number, y: number}>): number {
     return !this.props.horizontal ? metrics.y : metrics.x;
   }
 
@@ -1533,7 +1559,7 @@ class CellRenderer extends React.Component<
     fillRateHelper: FillRateHelper,
     horizontal: ?boolean,
     index: number,
-    inversionStyle: ?StyleObj,
+    inversionStyle: ?DangerouslyImpreciseStyleProp,
     item: Item,
     onLayout: (event: Object) => void, // This is extracted by ScrollViewStickyHeader
     onUnmount: (cellKey: string) => void,
diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js
index fbc83e2d153551..2bb196814abf13 100644
--- a/Libraries/Lists/VirtualizedSectionList.js
+++ b/Libraries/Lists/VirtualizedSectionList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule VirtualizedSectionList
  * @flow
diff --git a/Libraries/Lists/__flowtests__/FlatList-flowtest.js b/Libraries/Lists/__flowtests__/FlatList-flowtest.js
index 3fe757b63d8439..d8cbd75a153db4 100644
--- a/Libraries/Lists/__flowtests__/FlatList-flowtest.js
+++ b/Libraries/Lists/__flowtests__/FlatList-flowtest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/Libraries/Lists/__flowtests__/SectionList-flowtest.js b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
index 035e9e6f0f010c..93fa77c4631682 100644
--- a/Libraries/Lists/__flowtests__/SectionList-flowtest.js
+++ b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/Libraries/Lists/__tests__/FillRateHelper-test.js b/Libraries/Lists/__tests__/FillRateHelper-test.js
index 22e09f5a0a5816..612d02c5bf9ab0 100644
--- a/Libraries/Lists/__tests__/FillRateHelper-test.js
+++ b/Libraries/Lists/__tests__/FillRateHelper-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Lists/__tests__/FlatList-test.js b/Libraries/Lists/__tests__/FlatList-test.js
index a6d1ca5054163f..28dd377bd13862 100644
--- a/Libraries/Lists/__tests__/FlatList-test.js
+++ b/Libraries/Lists/__tests__/FlatList-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Lists/__tests__/SectionList-test.js b/Libraries/Lists/__tests__/SectionList-test.js
index 338cf5273c67cf..f669879df839d9 100644
--- a/Libraries/Lists/__tests__/SectionList-test.js
+++ b/Libraries/Lists/__tests__/SectionList-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Lists/__tests__/ViewabilityHelper-test.js b/Libraries/Lists/__tests__/ViewabilityHelper-test.js
index 1494b5b2f33542..ed94f7f7e253d2 100644
--- a/Libraries/Lists/__tests__/ViewabilityHelper-test.js
+++ b/Libraries/Lists/__tests__/ViewabilityHelper-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Lists/__tests__/VirtualizeUtils-test.js b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
index 3e8b2c9433f592..2361a86aaeff62 100644
--- a/Libraries/Lists/__tests__/VirtualizeUtils-test.js
+++ b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Lists/__tests__/VirtualizedList-test.js b/Libraries/Lists/__tests__/VirtualizedList-test.js
index d9c4e09a52ea45..14aec9140f1195 100644
--- a/Libraries/Lists/__tests__/VirtualizedList-test.js
+++ b/Libraries/Lists/__tests__/VirtualizedList-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
index 6d3c16a20a9738..dabdbc5d92f618 100644
--- a/Libraries/Modal/Modal.js
+++ b/Libraries/Modal/Modal.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Modal
  * @flow
@@ -31,7 +29,7 @@ import type EmitterSubscription from 'EmitterSubscription';
 
 /**
  * The Modal component is a simple way to present content above an enclosing view.
- * 
+ *
  * See https://facebook.github.io/react-native/docs/modal.html
  */
 
@@ -51,48 +49,48 @@ class Modal extends React.Component<Object> {
     animationType: PropTypes.oneOf(['none', 'slide', 'fade']),
     /**
      * The `presentationStyle` prop controls how the modal appears.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#presentationstyle
      */
     presentationStyle: PropTypes.oneOf(['fullScreen', 'pageSheet', 'formSheet', 'overFullScreen']),
     /**
      * The `transparent` prop determines whether your modal will fill the
-     * entire view. 
-     * 
+     * entire view.
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#transparent
      */
     transparent: PropTypes.bool,
     /**
      * The `hardwareAccelerated` prop controls whether to force hardware
      * acceleration for the underlying window.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#hardwareaccelerated
      */
     hardwareAccelerated: PropTypes.bool,
     /**
      * The `visible` prop determines whether your modal is visible.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#visible
      */
     visible: PropTypes.bool,
     /**
      * The `onRequestClose` callback is called when the user taps the hardware
      * back button on Android or the menu button on Apple TV.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#onrequestclose
      */
     onRequestClose: (Platform.isTVOS || Platform.OS === 'android') ? PropTypes.func.isRequired : PropTypes.func,
     /**
      * The `onShow` prop allows passing a function that will be called once the
      * modal has been shown.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#onshow
      */
     onShow: PropTypes.func,
     /**
      * The `onDismiss` prop allows passing a function that will be called once
      * the modal has been dismissed.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#ondismiss
      */
     onDismiss: PropTypes.func,
@@ -102,13 +100,13 @@ class Modal extends React.Component<Object> {
     ),
     /**
      * The `supportedOrientations` prop allows the modal to be rotated to any of the specified orientations.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#supportedorientations
      */
     supportedOrientations: PropTypes.arrayOf(PropTypes.oneOf(['portrait', 'portrait-upside-down', 'landscape', 'landscape-left', 'landscape-right'])),
     /**
      * The `onOrientationChange` callback is called when the orientation changes while the modal is being displayed.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#onorientationchange
      */
     onOrientationChange: PropTypes.func,
diff --git a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
index b87fd68c41381b..40763fd5b3a281 100644
--- a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
+++ b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
@@ -33,6 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)startAnimation;
 - (void)stepAnimationWithTime:(NSTimeInterval)currentTime;
 - (void)stopAnimation;
+- (void)resetAnimationConfig:(NSDictionary *)config;
 
 NS_ASSUME_NONNULL_END
 
diff --git a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
index 8d6cdd3e566971..d6ae6701e6ef99 100644
--- a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimationDriver.h"
diff --git a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
index cb471f95ed8443..b1e84d675db765 100644
--- a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDecayAnimation.h"
@@ -41,22 +39,27 @@ - (instancetype)initWithId:(NSNumber *)animationId
                   callBack:(nullable RCTResponseSenderBlock)callback;
 {
   if ((self = [super init])) {
-    NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
-
+    _callback = [callback copy];
     _animationId = animationId;
+    _valueNode = valueNode;
     _fromValue = 0;
     _lastValue = 0;
-    _valueNode = valueNode;
-    _callback = [callback copy];
-    _velocity = [RCTConvert CGFloat:config[@"velocity"]];
-    _deceleration = [RCTConvert CGFloat:config[@"deceleration"]];
-    _iterations = iterations.integerValue;
-    _currentLoop = 1;
-    _animationHasFinished = iterations.integerValue == 0;
+    _velocity = [RCTConvert CGFloat:config[@"velocity"]]; // initial velocity
+    [self resetAnimationConfig:config];
   }
   return self;
 }
 
+- (void)resetAnimationConfig:(NSDictionary *)config
+{
+  NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
+  _fromValue = _lastValue;
+  _deceleration = [RCTConvert CGFloat:config[@"deceleration"]];
+  _iterations = iterations.integerValue;
+  _currentLoop = 1;
+  _animationHasFinished = iterations.integerValue == 0;
+}
+
 RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
 - (void)startAnimation
diff --git a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
index 9fef45c83ec350..c6b6f7979b28bc 100644
--- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventDispatcher.h>
diff --git a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
index dd7dfc9cf327d0..9c35b13fc237fa 100644
--- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTEventAnimation.h"
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
index 403ce7796a42d4..979c45a8c32dfe 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimationDriver.h"
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
index a46fea6bf26ec3..ddcc056acfe975 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTFrameAnimation.h"
@@ -31,6 +29,7 @@ @implementation RCTFrameAnimation
   NSArray<NSNumber *> *_frames;
   CGFloat _toValue;
   CGFloat _fromValue;
+  CGFloat _lastPosition;
   NSTimeInterval _animationStartTime;
   NSTimeInterval _animationCurrentTime;
   RCTResponseSenderBlock _callback;
@@ -44,23 +43,30 @@ - (instancetype)initWithId:(NSNumber *)animationId
                   callBack:(nullable RCTResponseSenderBlock)callback;
 {
   if ((self = [super init])) {
-    NSNumber *toValue = [RCTConvert NSNumber:config[@"toValue"]] ?: @1;
-    NSArray<NSNumber *> *frames = [RCTConvert NSNumberArray:config[@"frames"]];
-    NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
-
     _animationId = animationId;
-    _toValue = toValue.floatValue;
-    _fromValue = valueNode.value;
+    _lastPosition = _fromValue = valueNode.value;
     _valueNode = valueNode;
-    _frames = [frames copy];
     _callback = [callback copy];
-    _animationHasFinished = iterations.integerValue == 0;
-    _iterations = iterations.integerValue;
-    _currentLoop = 1;
+    [self resetAnimationConfig:config];
   }
   return self;
 }
 
+- (void)resetAnimationConfig:(NSDictionary *)config
+{
+  NSNumber *toValue = [RCTConvert NSNumber:config[@"toValue"]] ?: @1;
+  NSArray<NSNumber *> *frames = [RCTConvert NSNumberArray:config[@"frames"]];
+  NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
+
+  _fromValue = _lastPosition;
+  _toValue = toValue.floatValue;
+  _frames = [frames copy];
+  _animationStartTime = _animationCurrentTime = -1;
+  _animationHasFinished = iterations.integerValue == 0;
+  _iterations = iterations.integerValue;
+  _currentLoop = 1;
+}
+
 RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
 - (void)startAnimation
@@ -144,6 +150,7 @@ - (void)updateOutputWithFrameOutput:(CGFloat)frameOutput
                                             EXTRAPOLATE_TYPE_EXTEND,
                                             EXTRAPOLATE_TYPE_EXTEND);
 
+  _lastPosition = outputValue;
   _valueNode.value = outputValue;
   [_valueNode setNeedsUpdate];
 }
diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
index acf1ae6063bedf..fe721f61d09d1a 100644
--- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimationDriver.h"
diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
index e4811f601d2594..7356738f22c5c1 100644
--- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSpringAnimation.h"
@@ -57,33 +55,37 @@ - (instancetype)initWithId:(NSNumber *)animationId
                   callBack:(nullable RCTResponseSenderBlock)callback
 {
   if ((self = [super init])) {
-    NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
-
     _animationId = animationId;
-    _toValue = [RCTConvert CGFloat:config[@"toValue"]];
-    _fromValue = valueNode.value;
-    _lastPosition = 0;
+    _lastPosition = valueNode.value;
     _valueNode = valueNode;
-    _overshootClamping = [RCTConvert BOOL:config[@"overshootClamping"]];
-    _restDisplacementThreshold = [RCTConvert CGFloat:config[@"restDisplacementThreshold"]];
-    _restSpeedThreshold = [RCTConvert CGFloat:config[@"restSpeedThreshold"]];
-    _stiffness = [RCTConvert CGFloat:config[@"stiffness"]];
-    _damping = [RCTConvert CGFloat:config[@"damping"]];
-    _mass = [RCTConvert CGFloat:config[@"mass"]];
-    _initialVelocity = [RCTConvert CGFloat:config[@"initialVelocity"]];
-    
+    _lastVelocity = [RCTConvert CGFloat:config[@"initialVelocity"]];
     _callback = [callback copy];
-
-    _lastPosition = _fromValue;
-    _lastVelocity = _initialVelocity;
-
-    _animationHasFinished = iterations.integerValue == 0;
-    _iterations = iterations.integerValue;
-    _currentLoop = 1;
+    [self resetAnimationConfig:config];
   }
   return self;
 }
 
+- (void)resetAnimationConfig:(NSDictionary *)config
+{
+  NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
+  _toValue = [RCTConvert CGFloat:config[@"toValue"]];
+  _overshootClamping = [RCTConvert BOOL:config[@"overshootClamping"]];
+  _restDisplacementThreshold = [RCTConvert CGFloat:config[@"restDisplacementThreshold"]];
+  _restSpeedThreshold = [RCTConvert CGFloat:config[@"restSpeedThreshold"]];
+  _stiffness = [RCTConvert CGFloat:config[@"stiffness"]];
+  _damping = [RCTConvert CGFloat:config[@"damping"]];
+  _mass = [RCTConvert CGFloat:config[@"mass"]];
+  _initialVelocity = _lastVelocity;
+  _fromValue = _lastPosition;
+  _fromValue = _lastPosition;
+  _lastVelocity = _initialVelocity;
+  _animationHasFinished = iterations.integerValue == 0;
+  _iterations = iterations.integerValue;
+  _currentLoop = 1;
+  _animationStartTime = _animationCurrentTime = -1;
+  _animationHasBegun = YES;
+}
+
 RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
 - (void)startAnimation
diff --git a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h
index 83641afead8442..0e2853df2cc151 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
index 54175b6b419e76..0bfb4d576be9b6 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAdditionAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
index 198e02c9cfc90f..e9d000910ffe3b 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
 
+@class RCTNativeAnimatedNodesManager;
+
 @interface RCTAnimatedNode : NSObject
 
 - (instancetype)initWithTag:(NSNumber *)tag
                      config:(NSDictionary<NSString *, id> *)config NS_DESIGNATED_INITIALIZER;
 
 @property (nonatomic, readonly) NSNumber *nodeTag;
+@property (nonatomic, weak) RCTNativeAnimatedNodesManager *manager;
 @property (nonatomic, copy, readonly) NSDictionary<NSString *, id> *config;
 
 @property (nonatomic, copy, readonly) NSMapTable<NSNumber *, RCTAnimatedNode *> *childNodes;
diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
index 0b8bd7ab02f16e..71397403a09e72 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h
index 3d6f1db192a228..5d89091eafcebc 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
index 811382a3bf1888..f2e7d8cd0574a5 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDiffClampAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h
index 83fac043b5437d..0702012dbab1ec 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
index 0ae3712ef1e364..a66807c3d3f878 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDivisionAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h
index 2257e49646dc20..e083525d688da2 100644
--- a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
index be804eda0492f4..b7fa8b50974d23 100644
--- a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTInterpolationAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h
index 5a50bf34d0533e..08de0e1aee2f27 100644
--- a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m
index adf252cdfceac3..c2802741d23789 100644
--- a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModuloAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h
index 43a1ff9b957ca9..481c3d5aa5b310 100644
--- a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
index c75c00e825e48e..29c151aed3f9a1 100644
--- a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMultiplicationAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h
index ac220f43f4e0ae..24919120a951b4 100644
--- a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
index e25b8cf42d3771..24fb1e82da888c 100644
--- a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPropsAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h
index 285ebf9deea6a0..637b120c48a42a 100644
--- a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
index 774cdbf526668c..a62d0309306620 100644
--- a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTStyleAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
new file mode 100644
index 00000000000000..99e9bd1112a60e
--- /dev/null
+++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTAnimatedNode.h"
+
+
+@interface RCTTrackingAnimatedNode : RCTAnimatedNode
+
+@end
diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
new file mode 100644
index 00000000000000..42150285da4cd2
--- /dev/null
+++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTTrackingAnimatedNode.h"
+#import "RCTValueAnimatedNode.h"
+#import "RCTNativeAnimatedNodesManager.h"
+
+@implementation RCTTrackingAnimatedNode {
+  NSNumber *_animationId;
+  NSNumber *_toValueNodeTag;
+  NSNumber *_valueNodeTag;
+  NSMutableDictionary *_animationConfig;
+}
+
+- (instancetype)initWithTag:(NSNumber *)tag
+                     config:(NSDictionary<NSString *, id> *)config
+{
+  if ((self = [super initWithTag:tag config:config])) {
+    _animationId = config[@"animationId"];
+    _toValueNodeTag = config[@"toValue"];
+    _valueNodeTag = config[@"value"];
+    _animationConfig = [NSMutableDictionary dictionaryWithDictionary:config[@"animationConfig"]];
+  }
+  return self;
+}
+
+- (void)onDetachedFromNode:(RCTAnimatedNode *)parent
+{
+  [self.manager stopAnimation:_animationId];
+  [super onDetachedFromNode:parent];
+}
+
+- (void)performUpdate
+{
+  [super performUpdate];
+
+  // change animation config's "toValue" to reflect updated value of the parent node
+  RCTValueAnimatedNode *node = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:_toValueNodeTag];
+  _animationConfig[@"toValue"] = @(node.value);
+
+  [self.manager startAnimatingNode:_animationId
+                           nodeTag:_valueNodeTag
+                            config:_animationConfig
+                       endCallback:nil];
+}
+
+@end
+
diff --git a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h
index 18d9eba0b8aa76..59d6951def67ad 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
index b2daa88b2c9c09..fd8ca221f93c72 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTransformAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h
index 5b66520b8210b5..8360dc659fb810 100644
--- a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
index 82eff7b62daed3..c433bba3414c81 100644
--- a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
index cddec7f5e67eeb..0ba2446271568a 100644
--- a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
+++ b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
@@ -111,6 +111,10 @@
 		2D3B5EFE1D9B0B4800451313 /* RCTStyleAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E501E31D07A6C9005F35D8 /* RCTStyleAnimatedNode.m */; };
 		2D3B5EFF1D9B0B4800451313 /* RCTTransformAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E501E51D07A6C9005F35D8 /* RCTTransformAnimatedNode.m */; };
 		2D3B5F001D9B0B4800451313 /* RCTValueAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E501E71D07A6C9005F35D8 /* RCTValueAnimatedNode.m */; };
+		44DB7D942024F74200588FCD /* RCTTrackingAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DB7D932024F74200588FCD /* RCTTrackingAnimatedNode.h */; };
+		44DB7D952024F74200588FCD /* RCTTrackingAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DB7D932024F74200588FCD /* RCTTrackingAnimatedNode.h */; };
+		44DB7D972024F75100588FCD /* RCTTrackingAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 44DB7D962024F75100588FCD /* RCTTrackingAnimatedNode.m */; };
+		44DB7D982024F75100588FCD /* RCTTrackingAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 44DB7D962024F75100588FCD /* RCTTrackingAnimatedNode.m */; };
 		5C9894951D999639008027DB /* RCTDivisionAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C9894941D999639008027DB /* RCTDivisionAnimatedNode.m */; };
 		944244D01DB962DA0032A02B /* RCTFrameAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C1294D1D4069170025F25C /* RCTFrameAnimation.m */; };
 		944244D11DB962DC0032A02B /* RCTSpringAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C1294F1D4069170025F25C /* RCTSpringAnimation.m */; };
@@ -209,6 +213,8 @@
 		19F00F201DC8847500113FEE /* RCTEventAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTEventAnimation.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		19F00F211DC8847500113FEE /* RCTEventAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTEventAnimation.m; sourceTree = "<group>"; };
 		2D2A28201D9B03D100D4039D /* libRCTAnimation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAnimation.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		44DB7D932024F74200588FCD /* RCTTrackingAnimatedNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTTrackingAnimatedNode.h; sourceTree = "<group>"; };
+		44DB7D962024F75100588FCD /* RCTTrackingAnimatedNode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTTrackingAnimatedNode.m; sourceTree = "<group>"; };
 		5C9894931D999639008027DB /* RCTDivisionAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDivisionAnimatedNode.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		5C9894941D999639008027DB /* RCTDivisionAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDivisionAnimatedNode.m; sourceTree = "<group>"; };
 		94C1294A1D4069170025F25C /* RCTAnimationDriver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTAnimationDriver.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -256,6 +262,8 @@
 				13E501E51D07A6C9005F35D8 /* RCTTransformAnimatedNode.m */,
 				13E501E61D07A6C9005F35D8 /* RCTValueAnimatedNode.h */,
 				13E501E71D07A6C9005F35D8 /* RCTValueAnimatedNode.m */,
+				44DB7D932024F74200588FCD /* RCTTrackingAnimatedNode.h */,
+				44DB7D962024F75100588FCD /* RCTTrackingAnimatedNode.m */,
 			);
 			path = Nodes;
 			sourceTree = "<group>";
@@ -314,6 +322,7 @@
 				192F69891E823F4A008692C7 /* RCTDiffClampAnimatedNode.h in Headers */,
 				192F698A1E823F4A008692C7 /* RCTAdditionAnimatedNode.h in Headers */,
 				192F698B1E823F4A008692C7 /* RCTAnimatedNode.h in Headers */,
+				44DB7D952024F74200588FCD /* RCTTrackingAnimatedNode.h in Headers */,
 				192F698C1E823F4A008692C7 /* RCTInterpolationAnimatedNode.h in Headers */,
 				192F698D1E823F4A008692C7 /* RCTModuloAnimatedNode.h in Headers */,
 				192F698E1E823F4A008692C7 /* RCTMultiplicationAnimatedNode.h in Headers */,
@@ -340,6 +349,7 @@
 				1980B71D1E80D1C4004DC789 /* RCTDiffClampAnimatedNode.h in Headers */,
 				1980B71F1E80D1C4004DC789 /* RCTAdditionAnimatedNode.h in Headers */,
 				1980B7211E80D1C4004DC789 /* RCTAnimatedNode.h in Headers */,
+				44DB7D942024F74200588FCD /* RCTTrackingAnimatedNode.h in Headers */,
 				1980B7231E80D1C4004DC789 /* RCTInterpolationAnimatedNode.h in Headers */,
 				1980B7251E80D1C4004DC789 /* RCTModuloAnimatedNode.h in Headers */,
 				1980B7271E80D1C4004DC789 /* RCTMultiplicationAnimatedNode.h in Headers */,
@@ -441,6 +451,7 @@
 				2D3B5EFA1D9B0B4800451313 /* RCTInterpolationAnimatedNode.m in Sources */,
 				2D3B5EFF1D9B0B4800451313 /* RCTTransformAnimatedNode.m in Sources */,
 				2D3B5EFC1D9B0B4800451313 /* RCTMultiplicationAnimatedNode.m in Sources */,
+				44DB7D982024F75100588FCD /* RCTTrackingAnimatedNode.m in Sources */,
 				2D3B5EFD1D9B0B4800451313 /* RCTPropsAnimatedNode.m in Sources */,
 				944244D01DB962DA0032A02B /* RCTFrameAnimation.m in Sources */,
 				944244D11DB962DC0032A02B /* RCTSpringAnimation.m in Sources */,
@@ -466,6 +477,7 @@
 				13E501EC1D07A6C9005F35D8 /* RCTMultiplicationAnimatedNode.m in Sources */,
 				13E501ED1D07A6C9005F35D8 /* RCTPropsAnimatedNode.m in Sources */,
 				13E501E91D07A6C9005F35D8 /* RCTAnimatedNode.m in Sources */,
+				44DB7D972024F75100588FCD /* RCTTrackingAnimatedNode.m in Sources */,
 				13E501EB1D07A6C9005F35D8 /* RCTInterpolationAnimatedNode.m in Sources */,
 				13E501E81D07A6C9005F35D8 /* RCTAdditionAnimatedNode.m in Sources */,
 				5C9894951D999639008027DB /* RCTDivisionAnimatedNode.m in Sources */,
diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.h b/Libraries/NativeAnimation/RCTAnimationUtils.h
index 5327c36676405a..d1dba830ee96aa 100644
--- a/Libraries/NativeAnimation/RCTAnimationUtils.h
+++ b/Libraries/NativeAnimation/RCTAnimationUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.m b/Libraries/NativeAnimation/RCTAnimationUtils.m
index d159c05b80416d..8f8d4cfb817a72 100644
--- a/Libraries/NativeAnimation/RCTAnimationUtils.m
+++ b/Libraries/NativeAnimation/RCTAnimationUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimationUtils.h"
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
index e4ffa3aa95cb27..5ca4e95bd82562 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
index 1125513ae08b06..2032f3a01a03c8 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 #import "RCTNativeAnimatedModule.h"
 
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
index 1a0b684c10a271..ae2176684007d6 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
index f37046612cbe1d..e05286decf9eb2 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNativeAnimatedNodesManager.h"
@@ -27,6 +25,7 @@
 #import "RCTStyleAnimatedNode.h"
 #import "RCTTransformAnimatedNode.h"
 #import "RCTValueAnimatedNode.h"
+#import "RCTTrackingAnimatedNode.h"
 
 @implementation RCTNativeAnimatedNodesManager
 {
@@ -67,7 +66,8 @@ - (void)createAnimatedNode:(nonnull NSNumber *)tag
             @"division" : [RCTDivisionAnimatedNode class],
             @"multiplication" : [RCTMultiplicationAnimatedNode class],
             @"modulus" : [RCTModuloAnimatedNode class],
-            @"transform" : [RCTTransformAnimatedNode class]};
+            @"transform" : [RCTTransformAnimatedNode class],
+            @"tracking" : [RCTTrackingAnimatedNode class]};
   });
 
   NSString *nodeType = [RCTConvert NSString:config[@"type"]];
@@ -79,6 +79,7 @@ - (void)createAnimatedNode:(nonnull NSNumber *)tag
   }
 
   RCTAnimatedNode *node = [[nodeClass alloc] initWithTag:tag config:config];
+  node.manager = self;
   _animationNodes[tag] = node;
   [node setNeedsUpdate];
 }
@@ -222,6 +223,15 @@ - (void)startAnimatingNode:(nonnull NSNumber *)animationId
                     config:(NSDictionary<NSString *, id> *)config
                endCallback:(RCTResponseSenderBlock)callBack
 {
+  // check if the animation has already started
+  for (id<RCTAnimationDriver> driver in _activeAnimations) {
+    if ([driver.animationId isEqual:animationId]) {
+      // if the animation is running, we restart it with an updated configuration
+      [driver resetAnimationConfig:config];
+      return;
+    }
+  }
+
   RCTValueAnimatedNode *valueNode = (RCTValueAnimatedNode *)_animationNodes[nodeTag];
 
   NSString *type = config[@"type"];
diff --git a/Libraries/Network/FormData.js b/Libraries/Network/FormData.js
index 63e1cb6320df1b..669bf0f2a30cf7 100644
--- a/Libraries/Network/FormData.js
+++ b/Libraries/Network/FormData.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FormData
  * @flow
diff --git a/Libraries/Network/NetInfo.js b/Libraries/Network/NetInfo.js
index 70466719cb809e..0db9d4eab26825 100644
--- a/Libraries/Network/NetInfo.js
+++ b/Libraries/Network/NetInfo.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NetInfo
  * @flow
@@ -82,13 +80,13 @@ const _isConnectedSubscriptions = new Map();
 
 /**
  * NetInfo exposes info about online/offline status.
- * 
+ *
  * See https://facebook.github.io/react-native/docs/netinfo.html
  */
 const NetInfo = {
   /**
    * Adds an event handler.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/netinfo.html#addeventlistener
    */
   addEventListener(
@@ -130,7 +128,7 @@ const NetInfo = {
 
   /**
    * Removes the listener for network status changes.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/netinfo.html#removeeventlistener
    */
   removeEventListener(
@@ -146,10 +144,10 @@ const NetInfo = {
   },
 
   /**
-   * This function is deprecated. Use `getConnectionInfo` instead. 
+   * This function is deprecated. Use `getConnectionInfo` instead.
    * Returns a promise that resolves with one of the deprecated connectivity
    * types:
-   * 
+   *
    * The following connectivity types are deprecated. They're used by the
    * deprecated APIs `fetch` and the `change` event.
    *
@@ -169,13 +167,13 @@ const NetInfo = {
    * - `MOBILE_HIPRI` - A High Priority Mobile data connection.
    * - `MOBILE_MMS` - An MMS-specific Mobile data connection.
    * - `MOBILE_SUPL` -  A SUPL-specific Mobile data connection.
-   * - `VPN` -  A virtual network using one or more native bearers. Requires 
+   * - `VPN` -  A virtual network using one or more native bearers. Requires
    * API Level 21
    * - `WIFI` - The WIFI data connection.
    * - `WIMAX` -  The WiMAX data connection.
    * - `UNKNOWN` - Unknown data connection.
    *
-   * The rest of the connectivity types are hidden by the Android API, but can 
+   * The rest of the connectivity types are hidden by the Android API, but can
    * be used if necessary.
    */
   fetch(): Promise<any> {
@@ -198,7 +196,7 @@ const NetInfo = {
   /**
    * An object with the same methods as above but the listener receives a
    * boolean which represents the internet connectivity.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/netinfo.html#isconnected
    */
   isConnected: {
diff --git a/Libraries/Network/RCTDataRequestHandler.h b/Libraries/Network/RCTDataRequestHandler.h
index 11f84592ec7d30..b0ded9161f283a 100644
--- a/Libraries/Network/RCTDataRequestHandler.h
+++ b/Libraries/Network/RCTDataRequestHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTInvalidating.h>
diff --git a/Libraries/Network/RCTDataRequestHandler.m b/Libraries/Network/RCTDataRequestHandler.m
index c71ce79a8ef258..f0e36dfb472654 100644
--- a/Libraries/Network/RCTDataRequestHandler.m
+++ b/Libraries/Network/RCTDataRequestHandler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDataRequestHandler.h"
diff --git a/Libraries/Network/RCTFileRequestHandler.h b/Libraries/Network/RCTFileRequestHandler.h
index 261e7a0fbf1b90..7ee7952c5259d9 100644
--- a/Libraries/Network/RCTFileRequestHandler.h
+++ b/Libraries/Network/RCTFileRequestHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTInvalidating.h>
diff --git a/Libraries/Network/RCTFileRequestHandler.m b/Libraries/Network/RCTFileRequestHandler.m
index bc2e14171a3908..7c4585a509d0f9 100644
--- a/Libraries/Network/RCTFileRequestHandler.m
+++ b/Libraries/Network/RCTFileRequestHandler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTFileRequestHandler.h"
diff --git a/Libraries/Network/RCTHTTPRequestHandler.h b/Libraries/Network/RCTHTTPRequestHandler.h
index b2395ce4d514f6..5148e6a510cc42 100644
--- a/Libraries/Network/RCTHTTPRequestHandler.h
+++ b/Libraries/Network/RCTHTTPRequestHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTInvalidating.h>
diff --git a/Libraries/Network/RCTHTTPRequestHandler.mm b/Libraries/Network/RCTHTTPRequestHandler.mm
index 1a6858820a20c1..6376ad31c812b2 100644
--- a/Libraries/Network/RCTHTTPRequestHandler.mm
+++ b/Libraries/Network/RCTHTTPRequestHandler.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTHTTPRequestHandler.h"
diff --git a/Libraries/Network/RCTNetInfo.h b/Libraries/Network/RCTNetInfo.h
index fabc291e0fbbf6..e38162d2dcbb7b 100644
--- a/Libraries/Network/RCTNetInfo.h
+++ b/Libraries/Network/RCTNetInfo.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <SystemConfiguration/SystemConfiguration.h>
diff --git a/Libraries/Network/RCTNetInfo.m b/Libraries/Network/RCTNetInfo.m
index be04f411881ecc..9b51a5c1ab4ff6 100644
--- a/Libraries/Network/RCTNetInfo.m
+++ b/Libraries/Network/RCTNetInfo.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNetInfo.h"
@@ -43,6 +41,7 @@ @implementation RCTNetInfo
   NSString *_effectiveConnectionType;
   NSString *_statusDeprecated;
   NSString *_host;
+  BOOL _isObserving;
 }
 
 RCT_EXPORT_MODULE()
@@ -50,6 +49,61 @@ @implementation RCTNetInfo
 static void RCTReachabilityCallback(__unused SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void *info)
 {
   RCTNetInfo *self = (__bridge id)info;
+  if ([self setReachabilityStatus:flags] && self->_isObserving) {
+    [self sendEventWithName:@"networkStatusDidChange" body:@{@"connectionType": self->_connectionType,
+                                                             @"effectiveConnectionType": self->_effectiveConnectionType,
+                                                             @"network_info": self->_statusDeprecated}];
+  }
+}
+
+#pragma mark - Lifecycle
+
+- (instancetype)initWithHost:(NSString *)host
+{
+  RCTAssertParam(host);
+  RCTAssert(![host hasPrefix:@"http"], @"Host value should just contain the domain, not the URL scheme.");
+
+  if ((self = [self init])) {
+    _host = [host copy];
+  }
+  return self;
+}
+
+- (NSArray<NSString *> *)supportedEvents
+{
+  return @[@"networkStatusDidChange"];
+}
+
+- (void)startObserving
+{
+  _isObserving = YES;
+  _connectionType = RCTConnectionTypeUnknown;
+  _effectiveConnectionType = RCTEffectiveConnectionTypeUnknown;
+  _statusDeprecated = RCTReachabilityStateUnknown;
+  _reachability = [self getReachabilityRef];
+}
+
+- (void)stopObserving
+{
+  _isObserving = NO;
+  if (_reachability) {
+    SCNetworkReachabilityUnscheduleFromRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
+    CFRelease(_reachability);
+  }
+}
+
+- (SCNetworkReachabilityRef)getReachabilityRef
+{
+  SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, _host.UTF8String ?: "apple.com");
+  SCNetworkReachabilityContext context = { 0, ( __bridge void *)self, NULL, NULL, NULL };
+  SCNetworkReachabilitySetCallback(reachability, RCTReachabilityCallback, &context);
+  SCNetworkReachabilityScheduleWithRunLoop(reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
+    
+  return reachability;
+}
+
+- (BOOL)setReachabilityStatus:(SCNetworkReachabilityFlags)flags
+{
   NSString *connectionType = RCTConnectionTypeUnknown;
   NSString *effectiveConnectionType = RCTEffectiveConnectionTypeUnknown;
   NSString *status = RCTReachabilityStateUnknown;
@@ -98,47 +152,10 @@ static void RCTReachabilityCallback(__unused SCNetworkReachabilityRef target, SC
     self->_connectionType = connectionType;
     self->_effectiveConnectionType = effectiveConnectionType;
     self->_statusDeprecated = status;
-    [self sendEventWithName:@"networkStatusDidChange" body:@{@"connectionType": connectionType,
-                                                             @"effectiveConnectionType": effectiveConnectionType,
-                                                             @"network_info": status}];
-  }
-}
-
-#pragma mark - Lifecycle
-
-- (instancetype)initWithHost:(NSString *)host
-{
-  RCTAssertParam(host);
-  RCTAssert(![host hasPrefix:@"http"], @"Host value should just contain the domain, not the URL scheme.");
-
-  if ((self = [self init])) {
-    _host = [host copy];
-  }
-  return self;
-}
-
-- (NSArray<NSString *> *)supportedEvents
-{
-  return @[@"networkStatusDidChange"];
-}
-
-- (void)startObserving
-{
-  _connectionType = RCTConnectionTypeUnknown;
-  _effectiveConnectionType = RCTEffectiveConnectionTypeUnknown;
-  _statusDeprecated = RCTReachabilityStateUnknown;
-  _reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, _host.UTF8String ?: "apple.com");
-  SCNetworkReachabilityContext context = { 0, ( __bridge void *)self, NULL, NULL, NULL };
-  SCNetworkReachabilitySetCallback(_reachability, RCTReachabilityCallback, &context);
-  SCNetworkReachabilityScheduleWithRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
-}
-
-- (void)stopObserving
-{
-  if (_reachability) {
-    SCNetworkReachabilityUnscheduleFromRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
-    CFRelease(_reachability);
+    return YES;
   }
+  
+  return NO;
 }
 
 #pragma mark - Public API
@@ -146,6 +163,9 @@ - (void)stopObserving
 RCT_EXPORT_METHOD(getCurrentConnectivity:(RCTPromiseResolveBlock)resolve
                   reject:(__unused RCTPromiseRejectBlock)reject)
 {
+  SCNetworkReachabilityRef reachability = [self getReachabilityRef];
+  SCNetworkReachabilityUnscheduleFromRunLoop(reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
+  CFRelease(reachability);
   resolve(@{@"connectionType": _connectionType ?: RCTConnectionTypeUnknown,
             @"effectiveConnectionType": _effectiveConnectionType ?: RCTEffectiveConnectionTypeUnknown,
             @"network_info": _statusDeprecated ?: RCTReachabilityStateUnknown});
diff --git a/Libraries/Network/RCTNetworkTask.h b/Libraries/Network/RCTNetworkTask.h
index f39e32a50c8867..5d54adaf4ffdfd 100644
--- a/Libraries/Network/RCTNetworkTask.h
+++ b/Libraries/Network/RCTNetworkTask.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/Network/RCTNetworkTask.m b/Libraries/Network/RCTNetworkTask.m
index 409da0e719fc9a..e13b3f6328b0e6 100644
--- a/Libraries/Network/RCTNetworkTask.m
+++ b/Libraries/Network/RCTNetworkTask.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTLog.h>
diff --git a/Libraries/Network/RCTNetworking.android.js b/Libraries/Network/RCTNetworking.android.js
index e6292ccfefa6ea..9ec01dccecb838 100644
--- a/Libraries/Network/RCTNetworking.android.js
+++ b/Libraries/Network/RCTNetworking.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTNetworking
  * @flow
diff --git a/Libraries/Network/RCTNetworking.h b/Libraries/Network/RCTNetworking.h
index 2aba529bf4eac1..463dc8f988a107 100644
--- a/Libraries/Network/RCTNetworking.h
+++ b/Libraries/Network/RCTNetworking.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/Libraries/Network/RCTNetworking.ios.js b/Libraries/Network/RCTNetworking.ios.js
index 4e2bfd1bef765f..004322a080f1bc 100644
--- a/Libraries/Network/RCTNetworking.ios.js
+++ b/Libraries/Network/RCTNetworking.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTNetworking
  * @flow
diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm
index 9e10791efc0edf..f8de23abf0127f 100644
--- a/Libraries/Network/RCTNetworking.mm
+++ b/Libraries/Network/RCTNetworking.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 
@@ -441,10 +439,6 @@ - (void)sendData:(NSData *)data
 {
   RCTAssertThread(_methodQueue, @"sendData: must be called on method queue");
 
-  if (data.length == 0) {
-    return;
-  }
-
   id responseData = nil;
   for (id<RCTNetworkingResponseHandler> handler in _responseHandlers) {
     if ([handler canHandleNetworkingResponse:responseType]) {
@@ -454,6 +448,10 @@ - (void)sendData:(NSData *)data
   }
 
   if (!responseData) {
+    if (data.length == 0) {
+      return;
+    }
+
     if ([responseType isEqualToString:@"text"]) {
       // No carry storage is required here because the entire data has been loaded.
       responseData = [RCTNetworking decodeTextData:data fromResponse:task.response withCarryData:nil];
diff --git a/Libraries/Network/XHRInterceptor.js b/Libraries/Network/XHRInterceptor.js
index 0c037c8e0359a7..09cc3b22038a56 100644
--- a/Libraries/Network/XHRInterceptor.js
+++ b/Libraries/Network/XHRInterceptor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule XHRInterceptor
  */
diff --git a/Libraries/Network/XMLHttpRequest.js b/Libraries/Network/XMLHttpRequest.js
index 082aaa8932fe23..d17001d3743f34 100644
--- a/Libraries/Network/XMLHttpRequest.js
+++ b/Libraries/Network/XMLHttpRequest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule XMLHttpRequest
  * @flow
diff --git a/Libraries/Network/__tests__/FormData-test.js b/Libraries/Network/__tests__/FormData-test.js
index fe132232eb02e5..a2b8eb0e7a4f1c 100644
--- a/Libraries/Network/__tests__/FormData-test.js
+++ b/Libraries/Network/__tests__/FormData-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Network/__tests__/XMLHttpRequest-test.js b/Libraries/Network/__tests__/XMLHttpRequest-test.js
index e03172db000edf..e4a4ed066494d0 100644
--- a/Libraries/Network/__tests__/XMLHttpRequest-test.js
+++ b/Libraries/Network/__tests__/XMLHttpRequest-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Network/convertRequestBody.js b/Libraries/Network/convertRequestBody.js
index 9a826d46e2c603..2d3ecc7353aa8d 100644
--- a/Libraries/Network/convertRequestBody.js
+++ b/Libraries/Network/convertRequestBody.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule convertRequestBody
  * @flow
diff --git a/Libraries/Network/fetch.js b/Libraries/Network/fetch.js
index d34d46987a1484..5a0de646c91258 100644
--- a/Libraries/Network/fetch.js
+++ b/Libraries/Network/fetch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule fetch
  *
diff --git a/Libraries/Performance/QuickPerformanceLogger.js b/Libraries/Performance/QuickPerformanceLogger.js
index 99516a4d5a0683..4eec7220a7cc7c 100644
--- a/Libraries/Performance/QuickPerformanceLogger.js
+++ b/Libraries/Performance/QuickPerformanceLogger.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule QuickPerformanceLogger
  * @flow
diff --git a/Libraries/Performance/SamplingProfiler.js b/Libraries/Performance/SamplingProfiler.js
index 87142782efc4d0..739274399bde9f 100644
--- a/Libraries/Performance/SamplingProfiler.js
+++ b/Libraries/Performance/SamplingProfiler.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SamplingProfiler
  * @flow
diff --git a/Libraries/Performance/Systrace.js b/Libraries/Performance/Systrace.js
index e491d7765dd2f5..2e38d8298d1e39 100644
--- a/Libraries/Performance/Systrace.js
+++ b/Libraries/Performance/Systrace.js
@@ -1,153 +1,100 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Systrace
  * @flow
+ * @format
  */
+
 'use strict';
 
 const invariant = require('fbjs/lib/invariant');
 
-type RelayProfiler = {
-  attachProfileHandler(
-    name: string,
-    handler: (name: string, state?: any) => () => void
-  ): void,
-
-  attachAggregateHandler(
-    name: string,
-    handler: (name: string, callback: () => void) => void
-  ): void,
-};
-
-/* eslint no-bitwise: 0 */
-const TRACE_TAG_REACT_APPS = 1 << 17;
-const TRACE_TAG_JS_VM_CALLS = 1 << 27;
+const TRACE_TAG_REACT_APPS = 1 << 17; // eslint-disable-line no-bitwise
+const TRACE_TAG_JS_VM_CALLS = 1 << 27; // eslint-disable-line no-bitwise
 
 let _enabled = false;
 let _asyncCookie = 0;
 const _markStack = [];
 let _markStackIndex = -1;
 let _canInstallReactHook = false;
-let _useFiber = false;
 
 // Implements a subset of User Timing API necessary for React measurements.
 // https://developer.mozilla.org/en-US/docs/Web/API/User_Timing_API
 const REACT_MARKER = '\u269B';
-const userTimingPolyfill = __DEV__ ? {
-  mark(markName: string) {
-    if (_enabled) {
-      _markStackIndex++;
-      _markStack[_markStackIndex] = markName;
-      let systraceLabel = markName;
-      // Since perf measurements are a shared namespace in User Timing API,
-      // we prefix all React results with a React emoji.
-      if (markName[0] === REACT_MARKER) {
-        // This is coming from React.
-        // Removing component IDs keeps trace colors stable.
-        const indexOfId = markName.lastIndexOf(' (#');
-        const cutoffIndex = indexOfId !== -1 ? indexOfId : markName.length;
-        // Also cut off the emoji because it breaks Systrace
-        systraceLabel = markName.slice(2, cutoffIndex);
-      }
-      Systrace.beginEvent(systraceLabel);
-    }
-  },
-  measure(measureName: string, startMark: ?string, endMark: ?string) {
-    if (_enabled) {
-      invariant(
-        typeof measureName === 'string' &&
-        typeof startMark === 'string' &&
-        typeof endMark === 'undefined',
-        'Only performance.measure(string, string) overload is supported.'
-      );
-      const topMark = _markStack[_markStackIndex];
-      invariant(
-        startMark === topMark,
-        'There was a mismatching performance.measure() call. ' +
-        'Expected "%s" but got "%s."',
-        topMark,
-        startMark,
-      );
-      _markStackIndex--;
-      // We can't use more descriptive measureName because Systrace doesn't
-      // let us edit labels post factum.
-      Systrace.endEvent();
-    }
-  },
-  clearMarks(markName: string) {
-    if (_enabled) {
-      if (_markStackIndex === -1) {
-        return;
-      }
-      if (markName === _markStack[_markStackIndex]) {
-        // React uses this for "cancelling" started measurements.
-        // Systrace doesn't support deleting measurements, so we just stop them.
-        if (userTimingPolyfill != null) {
-          userTimingPolyfill.measure(markName, markName);
+const userTimingPolyfill = __DEV__
+  ? {
+      mark(markName: string) {
+        if (_enabled) {
+          _markStackIndex++;
+          _markStack[_markStackIndex] = markName;
+          let systraceLabel = markName;
+          // Since perf measurements are a shared namespace in User Timing API,
+          // we prefix all React results with a React emoji.
+          if (markName[0] === REACT_MARKER) {
+            // This is coming from React.
+            // Removing component IDs keeps trace colors stable.
+            const indexOfId = markName.lastIndexOf(' (#');
+            const cutoffIndex = indexOfId !== -1 ? indexOfId : markName.length;
+            // Also cut off the emoji because it breaks Systrace
+            systraceLabel = markName.slice(2, cutoffIndex);
+          }
+          Systrace.beginEvent(systraceLabel);
         }
-      }
+      },
+      measure(measureName: string, startMark: ?string, endMark: ?string) {
+        if (_enabled) {
+          invariant(
+            typeof measureName === 'string' &&
+              typeof startMark === 'string' &&
+              typeof endMark === 'undefined',
+            'Only performance.measure(string, string) overload is supported.',
+          );
+          const topMark = _markStack[_markStackIndex];
+          invariant(
+            startMark === topMark,
+            'There was a mismatching performance.measure() call. ' +
+              'Expected "%s" but got "%s."',
+            topMark,
+            startMark,
+          );
+          _markStackIndex--;
+          // We can't use more descriptive measureName because Systrace doesn't
+          // let us edit labels post factum.
+          Systrace.endEvent();
+        }
+      },
+      clearMarks(markName: string) {
+        if (_enabled) {
+          if (_markStackIndex === -1) {
+            return;
+          }
+          if (markName === _markStack[_markStackIndex]) {
+            // React uses this for "cancelling" started measurements.
+            // Systrace doesn't support deleting measurements, so we just stop them.
+            if (userTimingPolyfill != null) {
+              userTimingPolyfill.measure(markName, markName);
+            }
+          }
+        }
+      },
+      clearMeasures() {
+        // React calls this to avoid memory leaks in browsers, but we don't keep
+        // measurements anyway.
+      },
     }
-  },
-  clearMeasures() {
-    // React calls this to avoid memory leaks in browsers, but we don't keep
-    // measurements anyway.
-  },
-} : null;
-
-// A hook to get React Stack markers in Systrace.
-const reactDebugToolHook = __DEV__ ? {
-  onBeforeMountComponent(debugID) {
-    const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
-    const displayName = ReactComponentTreeHook.getDisplayName(debugID);
-    Systrace.beginEvent(`ReactReconciler.mountComponent(${displayName})`);
-  },
-  onMountComponent(debugID) {
-    Systrace.endEvent();
-  },
-  onBeforeUpdateComponent(debugID) {
-    const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
-    const displayName = ReactComponentTreeHook.getDisplayName(debugID);
-    Systrace.beginEvent(`ReactReconciler.updateComponent(${displayName})`);
-  },
-  onUpdateComponent(debugID) {
-    Systrace.endEvent();
-  },
-  onBeforeUnmountComponent(debugID) {
-    const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
-    const displayName = ReactComponentTreeHook.getDisplayName(debugID);
-    Systrace.beginEvent(`ReactReconciler.unmountComponent(${displayName})`);
-  },
-  onUnmountComponent(debugID) {
-    Systrace.endEvent();
-  },
-  onBeginLifeCycleTimer(debugID, timerType) {
-    const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
-    const displayName = ReactComponentTreeHook.getDisplayName(debugID);
-    Systrace.beginEvent(`${displayName}.${timerType}()`);
-  },
-  onEndLifeCycleTimer(debugID, timerType) {
-    Systrace.endEvent();
-  },
-} : null;
+  : null;
 
 const Systrace = {
-  installReactHook(useFiber: boolean) {
+  installReactHook() {
     if (_enabled) {
       if (__DEV__) {
-        if (useFiber) {
-          global.performance = userTimingPolyfill;
-        } else {
-          require('ReactDebugTool').addHook(reactDebugToolHook);
-        }
+        global.performance = userTimingPolyfill;
       }
     }
-    _useFiber = useFiber;
     _canInstallReactHook = true;
   },
 
@@ -155,22 +102,15 @@ const Systrace = {
     if (_enabled !== enabled) {
       if (__DEV__) {
         if (enabled) {
-          global.nativeTraceBeginLegacy && global.nativeTraceBeginLegacy(TRACE_TAG_JS_VM_CALLS);
+          global.nativeTraceBeginLegacy &&
+            global.nativeTraceBeginLegacy(TRACE_TAG_JS_VM_CALLS);
         } else {
-          global.nativeTraceEndLegacy && global.nativeTraceEndLegacy(TRACE_TAG_JS_VM_CALLS);
+          global.nativeTraceEndLegacy &&
+            global.nativeTraceEndLegacy(TRACE_TAG_JS_VM_CALLS);
         }
         if (_canInstallReactHook) {
-          if (_useFiber) {
-            if (enabled && global.performance === undefined) {
-              global.performance = userTimingPolyfill;
-            }
-          } else {
-            const ReactDebugTool = require('ReactDebugTool');
-            if (enabled) {
-              ReactDebugTool.addHook(reactDebugToolHook);
-            } else {
-              ReactDebugTool.removeHook(reactDebugToolHook);
-            }
+          if (enabled && global.performance === undefined) {
+            global.performance = userTimingPolyfill;
           }
         }
       }
@@ -184,11 +124,11 @@ const Systrace = {
 
   /**
    * beginEvent/endEvent for starting and then ending a profile within the same call stack frame
-  **/
+   **/
   beginEvent(profileName?: any, args?: any) {
     if (_enabled) {
-      profileName = typeof profileName === 'function' ?
-        profileName() : profileName;
+      profileName =
+        typeof profileName === 'function' ? profileName() : profileName;
       global.nativeTraceBeginSection(TRACE_TAG_REACT_APPS, profileName, args);
     }
   },
@@ -203,117 +143,45 @@ const Systrace = {
    * beginAsyncEvent/endAsyncEvent for starting and then ending a profile where the end can either
    * occur on another thread or out of the current stack frame, eg await
    * the returned cookie variable should be used as input into the endAsyncEvent call to end the profile
-  **/
+   **/
   beginAsyncEvent(profileName?: any): any {
     const cookie = _asyncCookie;
     if (_enabled) {
       _asyncCookie++;
-      profileName = typeof profileName === 'function' ?
-        profileName() : profileName;
-      global.nativeTraceBeginAsyncSection(TRACE_TAG_REACT_APPS, profileName, cookie);
+      profileName =
+        typeof profileName === 'function' ? profileName() : profileName;
+      global.nativeTraceBeginAsyncSection(
+        TRACE_TAG_REACT_APPS,
+        profileName,
+        cookie,
+      );
     }
     return cookie;
   },
 
   endAsyncEvent(profileName?: any, cookie?: any) {
     if (_enabled) {
-      profileName = typeof profileName === 'function' ?
-        profileName() : profileName;
-      global.nativeTraceEndAsyncSection(TRACE_TAG_REACT_APPS, profileName, cookie);
+      profileName =
+        typeof profileName === 'function' ? profileName() : profileName;
+      global.nativeTraceEndAsyncSection(
+        TRACE_TAG_REACT_APPS,
+        profileName,
+        cookie,
+      );
     }
   },
 
   /**
    * counterEvent registers the value to the profileName on the systrace timeline
-  **/
+   **/
   counterEvent(profileName?: any, value?: any) {
     if (_enabled) {
-      profileName = typeof profileName === 'function' ?
-        profileName() : profileName;
+      profileName =
+        typeof profileName === 'function' ? profileName() : profileName;
       global.nativeTraceCounter &&
         global.nativeTraceCounter(TRACE_TAG_REACT_APPS, profileName, value);
     }
   },
-
-  /**
-   * Relay profiles use await calls, so likely occur out of current stack frame
-   * therefore async variant of profiling is used
-  **/
-  attachToRelayProfiler(relayProfiler: RelayProfiler) {
-    relayProfiler.attachProfileHandler('*', (name, state?) => {
-      if (state != null && state.queryName !== undefined) {
-        name += '_' + state.queryName
-      }
-      const cookie = Systrace.beginAsyncEvent(name);
-      return () => {
-        Systrace.endAsyncEvent(name, cookie);
-      };
-    });
-
-    relayProfiler.attachAggregateHandler('*', (name, callback) => {
-      Systrace.beginEvent(name);
-      callback();
-      Systrace.endEvent();
-    });
-  },
-
-  /* This is not called by default due to perf overhead but it's useful
-     if you want to find traces which spend too much time in JSON. */
-  swizzleJSON() {
-    Systrace.measureMethods(JSON, 'JSON', [
-      'parse',
-      'stringify'
-    ]);
-  },
-
- /**
-  * Measures multiple methods of a class. For example, you can do:
-  * Systrace.measureMethods(JSON, 'JSON', ['parse', 'stringify']);
-  *
-  * @param object
-  * @param objectName
-  * @param methodNames Map from method names to method display names.
-  */
- measureMethods(object: any, objectName: string, methodNames: Array<string>): void {
-   if (!__DEV__) {
-     return;
-   }
-
-   methodNames.forEach(methodName => {
-     object[methodName] = Systrace.measure(
-       objectName,
-       methodName,
-       object[methodName]
-     );
-   });
- },
-
- /**
-  * Returns an profiled version of the input function. For example, you can:
-  * JSON.parse = Systrace.measure('JSON', 'parse', JSON.parse);
-  *
-  * @param objName
-  * @param fnName
-  * @param {function} func
-  * @return {function} replacement function
-  */
- measure(objName: string, fnName: string, func: any): any {
-   if (!__DEV__) {
-     return func;
-   }
-
-   const profileName = `${objName}.${fnName}`;
-   return function() {
-     if (!_enabled) {
-       return func.apply(this, arguments);
-     }
-
-     Systrace.beginEvent(profileName);
-     const ret = func.apply(this, arguments);
-     Systrace.endEvent();
-     return ret;
-   };
- },
 };
 
 if (__DEV__) {
diff --git a/Libraries/PermissionsAndroid/PermissionsAndroid.js b/Libraries/PermissionsAndroid/PermissionsAndroid.js
index f06e6af51ecd9b..18858e1669dbf7 100644
--- a/Libraries/PermissionsAndroid/PermissionsAndroid.js
+++ b/Libraries/PermissionsAndroid/PermissionsAndroid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PermissionsAndroid
  * @flow
@@ -21,7 +19,7 @@ type Rationale = {
 type PermissionStatus = 'granted' | 'denied' | 'never_ask_again';
 /**
  * `PermissionsAndroid` provides access to Android M's new permissions model.
- * 
+ *
  * See https://facebook.github.io/react-native/docs/permissionsandroid.html
  */
 
@@ -83,7 +81,7 @@ class PermissionsAndroid {
   /**
    * Returns a promise resolving to a boolean value as to whether the specified
    * permissions has been granted
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/permissionsandroid.html#check
    */
   check(permission: string) : Promise<boolean> {
@@ -137,7 +135,7 @@ class PermissionsAndroid {
    * Prompts the user to enable multiple permissions in the same dialog and
    * returns an object with the permissions as keys and strings as values
    * indicating whether the user allowed or denied the request
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/permissionsandroid.html#requestmultiple
    */
   requestMultiple(permissions: Array<string>) : Promise<{[permission: string]: PermissionStatus}> {
diff --git a/Libraries/Promise.js b/Libraries/Promise.js
index 61ea1ede732dc7..288ee75f6f0f72 100644
--- a/Libraries/Promise.js
+++ b/Libraries/Promise.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Promise
  * @flow
diff --git a/Libraries/PushNotificationIOS/PushNotificationIOS.js b/Libraries/PushNotificationIOS/PushNotificationIOS.js
index 0b13954834954f..955bdf8c1adc9d 100644
--- a/Libraries/PushNotificationIOS/PushNotificationIOS.js
+++ b/Libraries/PushNotificationIOS/PushNotificationIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PushNotificationIOS
  * @flow
@@ -104,7 +102,7 @@ class PushNotificationIOS {
 
   /**
    * Cancels all scheduled localNotifications.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#cancelalllocalnotifications
    */
   static cancelAllLocalNotifications() {
@@ -113,7 +111,7 @@ class PushNotificationIOS {
 
   /**
    * Remove all delivered notifications from Notification Center.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#removealldeliverednotifications
    */
   static removeAllDeliveredNotifications(): void {
@@ -140,7 +138,7 @@ class PushNotificationIOS {
 
   /**
    * Sets the badge number for the app icon on the home screen.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#setapplicationiconbadgenumber
    */
   static setApplicationIconBadgeNumber(number: number) {
@@ -149,7 +147,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the current badge number for the app icon on the home screen.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getapplicationiconbadgenumber
    */
   static getApplicationIconBadgeNumber(callback: Function) {
@@ -167,7 +165,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the local notifications that are currently scheduled.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getscheduledlocalnotifications
    */
   static getScheduledLocalNotifications(callback: Function) {
@@ -221,7 +219,7 @@ class PushNotificationIOS {
   /**
    * Removes the event listener. Do this in `componentWillUnmount` to prevent
    * memory leaks.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#removeeventlistener
    */
   static removeEventListener(type: PushNotificationEventName, handler: Function) {
@@ -242,7 +240,7 @@ class PushNotificationIOS {
    * dialog box. By default, it will request all notification permissions, but
    * a subset of these can be requested by passing a map of requested
    * permissions.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#requestpermissions
    */
   static requestPermissions(permissions?: {
@@ -283,7 +281,7 @@ class PushNotificationIOS {
   /**
    * See what push permissions are currently enabled. `callback` will be
    * invoked with a `permissions` object.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#checkpermissions
    */
   static checkPermissions(callback: Function) {
@@ -297,7 +295,7 @@ class PushNotificationIOS {
   /**
    * This method returns a promise that resolves to either the notification
    * object if the app was launched by a push notification, or `null` otherwise.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getinitialnotification
    */
   static getInitialNotification(): Promise<?PushNotificationIOS> {
@@ -310,7 +308,7 @@ class PushNotificationIOS {
    * You will never need to instantiate `PushNotificationIOS` yourself.
    * Listening to the `notification` event and invoking
    * `getInitialNotification` is sufficient
-   * 
+   *
    */
   constructor(nativeNotif: Object) {
     this._data = {};
@@ -349,7 +347,7 @@ class PushNotificationIOS {
   /**
    * This method is available for remote notifications that have been received via:
    * `application:didReceiveRemoteNotification:fetchCompletionHandler:`
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#finish
    */
   finish(fetchResult: string) {
@@ -371,7 +369,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the sound string from the `aps` object
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getsound
    */
   getSound(): ?string {
@@ -380,7 +378,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the category string from the `aps` object
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getcategory
    */
   getCategory(): ?string {
@@ -389,7 +387,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the notification's main message from the `aps` object
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getalert
    */
   getAlert(): ?string | ?Object {
@@ -398,7 +396,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the content-available number from the `aps` object
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getcontentavailable
    */
   getContentAvailable(): ContentAvailable {
@@ -407,7 +405,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the badge count number from the `aps` object
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getbadgecount
    */
   getBadgeCount(): ?number {
@@ -416,7 +414,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the data object on the notif
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getdata
    */
   getData(): ?Object {
@@ -425,7 +423,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the thread ID on the notif
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getthreadid
    */
   getThreadID(): ?string {
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
index 82605468f1867d..8f19ede508a7d7 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
index aeb8af20224087..77aff3cbe81fa0 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPushNotificationManager.h"
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h
index 889108f5d0662e..98e7f9ce2c1c34 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m
index cee6e01b97e045..9c500274942718 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h
index 6ae45d2313d629..21e55d847d2715 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
index 73af891598867d..40bc79a085926b 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/RCTTest/RCTSnapshotManager.h b/Libraries/RCTTest/RCTSnapshotManager.h
index 24486906b638e1..de7ecc818c49b6 100644
--- a/Libraries/RCTTest/RCTSnapshotManager.h
+++ b/Libraries/RCTTest/RCTSnapshotManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/RCTTest/RCTSnapshotManager.m b/Libraries/RCTTest/RCTSnapshotManager.m
index e74cf9c3005d7b..5f1d97337cbfa2 100644
--- a/Libraries/RCTTest/RCTSnapshotManager.m
+++ b/Libraries/RCTTest/RCTSnapshotManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSnapshotManager.h"
diff --git a/Libraries/RCTTest/RCTTestModule.h b/Libraries/RCTTest/RCTTestModule.h
index 7bf93034e24d7d..b658a76c1fca9e 100644
--- a/Libraries/RCTTest/RCTTestModule.h
+++ b/Libraries/RCTTest/RCTTestModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/RCTTest/RCTTestModule.m b/Libraries/RCTTest/RCTTestModule.m
index dd2424d31ddbbc..4f44c4c40c9e68 100644
--- a/Libraries/RCTTest/RCTTestModule.m
+++ b/Libraries/RCTTest/RCTTestModule.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTestModule.h"
diff --git a/Libraries/RCTTest/RCTTestRunner.h b/Libraries/RCTTest/RCTTestRunner.h
index 9a50e94b2c9f13..39e032650e1477 100644
--- a/Libraries/RCTTest/RCTTestRunner.h
+++ b/Libraries/RCTTest/RCTTestRunner.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/RCTTest/RCTTestRunner.m b/Libraries/RCTTest/RCTTestRunner.m
index cb865302087975..00e97137282d0b 100644
--- a/Libraries/RCTTest/RCTTestRunner.m
+++ b/Libraries/RCTTest/RCTTestRunner.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTestRunner.h"
diff --git a/Libraries/RCTTest/SnapshotViewIOS.android.js b/Libraries/RCTTest/SnapshotViewIOS.android.js
index c9127822d50c2b..ef8eb9d7bf67f6 100644
--- a/Libraries/RCTTest/SnapshotViewIOS.android.js
+++ b/Libraries/RCTTest/SnapshotViewIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SnapshotViewIOS
  */
diff --git a/Libraries/RCTTest/SnapshotViewIOS.ios.js b/Libraries/RCTTest/SnapshotViewIOS.ios.js
index a3f4ee06cadf41..494830cd4ff3c0 100644
--- a/Libraries/RCTTest/SnapshotViewIOS.ios.js
+++ b/Libraries/RCTTest/SnapshotViewIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SnapshotViewIOS
  * @flow
diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js
index 3c5e3e2cd40c53..3060d6de450049 100644
--- a/Libraries/ReactNative/AppContainer.js
+++ b/Libraries/ReactNative/AppContainer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AppContainer
  * @format
@@ -29,6 +27,7 @@ type Props = {|
    * suppresses an error when upgrading Flow's support for React. To see the
    * error delete this comment and run Flow. */
   children?: React.Children,
+  fabric?: boolean,
   rootTag: number,
   WrapperComponent?: ?React.ComponentType<*>,
 |};
@@ -92,7 +91,8 @@ class AppContainer extends React.Component<Props, State> {
   render(): React.Node {
     let yellowBox = null;
     if (__DEV__) {
-      if (!global.__RCTProfileIsProfiling) {
+      if (!global.__RCTProfileIsProfiling && !this.props.fabric) {
+        // TODO: Fabric doesn't support YellowBox.
         const YellowBox = require('YellowBox');
         yellowBox = <YellowBox />;
       }
diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js
index 98699f18f0a17d..87bd07a6dd14f2 100644
--- a/Libraries/ReactNative/AppRegistry.js
+++ b/Libraries/ReactNative/AppRegistry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AppRegistry
  * @flow
diff --git a/Libraries/ReactNative/FabricUIManager.js b/Libraries/ReactNative/FabricUIManager.js
index df6ea4f0c83d75..602b5459101b7d 100644
--- a/Libraries/ReactNative/FabricUIManager.js
+++ b/Libraries/ReactNative/FabricUIManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FabricUIManager
  * @flow
@@ -12,53 +10,29 @@
  */
 'use strict';
 
-// TODO: fix the types
-type Node = number;
-type NodeSet = number;
+// TODO: type these properly.
+type Node = {};
+type NodeSet = Array<Node>;
 type NodeProps = {};
+type InstanceHandle = {};
 type Spec = {|
   +createNode: (
     reactTag: number,
     viewName: string,
     rootTag: number,
     props: NodeProps,
-    instanceHandle: number,
+    instanceHandle: InstanceHandle,
   ) => Node,
   +cloneNode: (node: Node) => Node,
   +cloneNodeWithNewChildren: (node: Node) => Node,
   +cloneNodeWithNewProps: (node: Node, newProps: NodeProps) => Node,
   +cloneNodeWithNewChildrenAndProps: (node: Node, newProps: NodeProps) => Node,
+  +createChildSet: (rootTag: number) => NodeSet,
   +appendChild: (parentNode: Node, child: Node) => Node,
   +appendChildToSet: (childSet: NodeSet, child: Node) => void,
   +completeRoot: (rootTag: number, childSet: NodeSet) => void,
 |};
 
-const NativeFabricUIManager: Spec = require('NativeModules').FabricUIManager;
-
-const FabricUIManager: Spec = {
-  createNode(
-    reactTag: number,
-    viewName: string,
-    rootTag: number,
-    props: NodeProps,
-    instanceHandle: number,
-  ): number {
-    return NativeFabricUIManager.createNode(
-      reactTag,
-      viewName,
-      rootTag,
-      props,
-      0, // TODO: instanceHandle is cannot be JSON serialized.
-    );
-  },
-  cloneNode: NativeFabricUIManager.cloneNode,
-  cloneNodeWithNewChildren: NativeFabricUIManager.cloneNodeWithNewChildren,
-  cloneNodeWithNewProps: NativeFabricUIManager.cloneNodeWithNewProps,
-  cloneNodeWithNewChildrenAndProps:
-    NativeFabricUIManager.cloneNodeWithNewChildrenAndProps,
-  appendChild: NativeFabricUIManager.appendChild,
-  appendChildToSet: NativeFabricUIManager.appendChildToSet,
-  completeRoot: NativeFabricUIManager.completeRoot,
-};
+const FabricUIManager: ?Spec = global.nativeFabricUIManager;
 
 module.exports = FabricUIManager;
diff --git a/Libraries/ReactNative/I18nManager.js b/Libraries/ReactNative/I18nManager.js
index 7c6ad67a4e2bfe..a8a256d515f480 100644
--- a/Libraries/ReactNative/I18nManager.js
+++ b/Libraries/ReactNative/I18nManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule I18nManager
  * @flow
diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js
index ed56fb626862b5..946d2233c5f132 100644
--- a/Libraries/ReactNative/UIManager.js
+++ b/Libraries/ReactNative/UIManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule UIManager
  * @flow
@@ -79,7 +77,7 @@ if (Platform.OS === 'ios') {
       });
     }
   });
-} else if (Platform.OS === 'android' && UIManager.ViewManagerNames) {
+} else if (UIManager.ViewManagerNames) {
   UIManager.ViewManagerNames.forEach(viewManagerName => {
     defineLazyObjectProperty(UIManager, viewManagerName, {
       get: () => UIManager.getConstantsForViewManager(viewManagerName),
diff --git a/Libraries/ReactNative/UIManagerStatTracker.js b/Libraries/ReactNative/UIManagerStatTracker.js
index 5d03e432aa3099..31f0a83613ffd1 100644
--- a/Libraries/ReactNative/UIManagerStatTracker.js
+++ b/Libraries/ReactNative/UIManagerStatTracker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule UIManagerStatTracker
  * @flow
diff --git a/Libraries/ReactNative/YellowBox.js b/Libraries/ReactNative/YellowBox.js
index 08421ad2538c85..8bd31d3cd8b768 100644
--- a/Libraries/ReactNative/YellowBox.js
+++ b/Libraries/ReactNative/YellowBox.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule YellowBox
  * @flow
diff --git a/Libraries/ReactNative/queryLayoutByID.js b/Libraries/ReactNative/queryLayoutByID.js
index 3b6909e460cccb..d484405920d29a 100644
--- a/Libraries/ReactNative/queryLayoutByID.js
+++ b/Libraries/ReactNative/queryLayoutByID.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule queryLayoutByID
  * @flow
diff --git a/Libraries/ReactNative/renderApplication.js b/Libraries/ReactNative/renderApplication.js
index 6d6783ec2b6a4e..e72853e8e459c0 100644
--- a/Libraries/ReactNative/renderApplication.js
+++ b/Libraries/ReactNative/renderApplication.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule renderApplication
  * @format
@@ -44,15 +42,8 @@ function renderApplication<Props: Object>(
     RootComponent.prototype.unstable_isAsyncReactComponent === true
   ) {
     // $FlowFixMe This is not yet part of the official public API
-    class AppContainerAsyncWrapper extends React.unstable_AsyncComponent {
-      render() {
-        return this.props.children;
-      }
-    }
-
-    renderable = (
-      <AppContainerAsyncWrapper>{renderable}</AppContainerAsyncWrapper>
-    );
+    const AsyncMode = React.unstable_AsyncMode;
+    renderable = <AsyncMode>{renderable}</AsyncMode>;
   }
 
   ReactNative.render(renderable, rootTag);
diff --git a/Libraries/ReactNative/renderFabricSurface.js b/Libraries/ReactNative/renderFabricSurface.js
index 268e588e4f2907..841a079b1d0675 100644
--- a/Libraries/ReactNative/renderFabricSurface.js
+++ b/Libraries/ReactNative/renderFabricSurface.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule renderFabricSurface
  * @format
@@ -32,7 +30,10 @@ function renderFabricSurface<Props: Object>(
   invariant(rootTag, 'Expect to have a valid rootTag, instead got ', rootTag);
 
   let renderable = (
-    <AppContainer rootTag={rootTag} WrapperComponent={WrapperComponent}>
+    <AppContainer
+      fabric={true}
+      rootTag={rootTag}
+      WrapperComponent={WrapperComponent}>
       <RootComponent {...initialProps} rootTag={rootTag} />
     </AppContainer>
   );
@@ -45,15 +46,8 @@ function renderFabricSurface<Props: Object>(
     RootComponent.prototype.unstable_isAsyncReactComponent === true
   ) {
     // $FlowFixMe This is not yet part of the official public API
-    class AppContainerAsyncWrapper extends React.unstable_AsyncComponent {
-      render() {
-        return this.props.children;
-      }
-    }
-
-    renderable = (
-      <AppContainerAsyncWrapper>{renderable}</AppContainerAsyncWrapper>
-    );
+    const AsyncMode = React.unstable_AsyncMode;
+    renderable = <AsyncMode>{renderable}</AsyncMode>;
   }
 
   ReactFabric.render(renderable, rootTag);
diff --git a/Libraries/ReactNative/requireFabricComponent.js b/Libraries/ReactNative/requireFabricComponent.js
new file mode 100644
index 00000000000000..1544c6fdff976e
--- /dev/null
+++ b/Libraries/ReactNative/requireFabricComponent.js
@@ -0,0 +1,240 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule requireFabricComponent
+ * @flow
+ * @format
+ */
+'use strict';
+
+const Platform = require('Platform');
+const {
+  ReactNativeBridgeEventPlugin,
+  createReactNativeComponentClass,
+} = require('ReactFabricInternals');
+const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
+const UIManager = require('UIManager');
+
+const insetsDiffer = require('insetsDiffer');
+const matricesDiffer = require('matricesDiffer');
+const pointsDiffer = require('pointsDiffer');
+const processColor = require('processColor');
+const resolveAssetSource = require('resolveAssetSource');
+const sizesDiffer = require('sizesDiffer');
+const verifyPropTypes = require('verifyPropTypes');
+const invariant = require('fbjs/lib/invariant');
+const warning = require('fbjs/lib/warning');
+
+/**
+ * Used to create React components that directly wrap native component
+ * implementations.  Config information is extracted from data exported from the
+ * UIManager module.  You should also wrap the native component in a
+ * hand-written component with full propTypes definitions and other
+ * documentation - pass the hand-written component in as `componentInterface` to
+ * verify all the native props are documented via `propTypes`.
+ *
+ * If some native props shouldn't be exposed in the wrapper interface, you can
+ * pass null for `componentInterface` and call `verifyPropTypes` directly
+ * with `nativePropsToIgnore`;
+ *
+ * Common types are lined up with the appropriate prop differs with
+ * `TypeToDifferMap`.  Non-scalar types not in the map default to `deepDiffer`.
+ */
+import type {ComponentInterface} from 'verifyPropTypes';
+
+let hasAttachedDefaultEventTypes: boolean = false;
+
+function requireNativeComponent(
+  viewName: string,
+  componentInterface?: ?ComponentInterface,
+  extraConfig?: ?{nativeOnly?: Object},
+): React$ComponentType<any> | string {
+  function attachDefaultEventTypes(viewConfig: any) {
+    if (Platform.OS === 'android') {
+      // This is supported on Android platform only,
+      // as lazy view managers discovery is Android-specific.
+      if (UIManager.ViewManagerNames) {
+        // Lazy view managers enabled.
+        viewConfig = merge(viewConfig, UIManager.getDefaultEventTypes());
+      } else {
+        viewConfig.bubblingEventTypes = merge(
+          viewConfig.bubblingEventTypes,
+          UIManager.genericBubblingEventTypes,
+        );
+        viewConfig.directEventTypes = merge(
+          viewConfig.directEventTypes,
+          UIManager.genericDirectEventTypes,
+        );
+      }
+    }
+  }
+
+  function merge(destination: ?Object, source: ?Object): ?Object {
+    if (!source) {
+      return destination;
+    }
+    if (!destination) {
+      return source;
+    }
+
+    for (const key in source) {
+      if (!source.hasOwnProperty(key)) {
+        continue;
+      }
+
+      var sourceValue = source[key];
+      if (destination.hasOwnProperty(key)) {
+        const destinationValue = destination[key];
+        if (
+          typeof sourceValue === 'object' &&
+          typeof destinationValue === 'object'
+        ) {
+          sourceValue = merge(destinationValue, sourceValue);
+        }
+      }
+      destination[key] = sourceValue;
+    }
+    return destination;
+  }
+
+  // Don't load the ViewConfig from UIManager until it's needed for rendering.
+  // Lazy-loading this can help avoid Prepack deopts.
+  function getViewConfig() {
+    const viewConfig = UIManager[viewName];
+
+    invariant(
+      viewConfig != null && !viewConfig.NativeProps != null,
+      'Native component for "%s" does not exist',
+      viewName,
+    );
+
+    viewConfig.uiViewClassName = viewName;
+    viewConfig.validAttributes = {};
+
+    // ReactNative `View.propTypes` have been deprecated in favor of
+    // `ViewPropTypes`. In their place a temporary getter has been added with a
+    // deprecated warning message. Avoid triggering that warning here by using
+    // temporary workaround, __propTypesSecretDontUseThesePlease.
+    // TODO (bvaughn) Revert this particular change any time after April 1
+    if (componentInterface) {
+      viewConfig.propTypes =
+        typeof componentInterface.__propTypesSecretDontUseThesePlease ===
+        'object'
+          ? componentInterface.__propTypesSecretDontUseThesePlease
+          : componentInterface.propTypes;
+    } else {
+      viewConfig.propTypes = null;
+    }
+
+    let baseModuleName = viewConfig.baseModuleName;
+    let bubblingEventTypes = viewConfig.bubblingEventTypes;
+    let directEventTypes = viewConfig.directEventTypes;
+    let nativeProps = viewConfig.NativeProps;
+    while (baseModuleName) {
+      const baseModule = UIManager[baseModuleName];
+      if (!baseModule) {
+        warning(false, 'Base module "%s" does not exist', baseModuleName);
+        baseModuleName = null;
+      } else {
+        bubblingEventTypes = {
+          ...baseModule.bubblingEventTypes,
+          ...bubblingEventTypes,
+        };
+        directEventTypes = {
+          ...baseModule.directEventTypes,
+          ...directEventTypes,
+        };
+        nativeProps = {
+          ...baseModule.NativeProps,
+          ...nativeProps,
+        };
+        baseModuleName = baseModule.baseModuleName;
+      }
+    }
+
+    viewConfig.bubblingEventTypes = bubblingEventTypes;
+    viewConfig.directEventTypes = directEventTypes;
+
+    for (const key in nativeProps) {
+      let useAttribute = false;
+      const attribute = {};
+
+      const differ = TypeToDifferMap[nativeProps[key]];
+      if (differ) {
+        attribute.diff = differ;
+        useAttribute = true;
+      }
+
+      const processor = TypeToProcessorMap[nativeProps[key]];
+      if (processor) {
+        attribute.process = processor;
+        useAttribute = true;
+      }
+
+      viewConfig.validAttributes[key] = useAttribute ? attribute : true;
+    }
+
+    // Unfortunately, the current set up puts the style properties on the top
+    // level props object. We also need to add the nested form for API
+    // compatibility. This allows these props on both the top level and the
+    // nested style level. TODO: Move these to nested declarations on the
+    // native side.
+    viewConfig.validAttributes.style = ReactNativeStyleAttributes;
+
+    if (__DEV__) {
+      componentInterface &&
+        verifyPropTypes(
+          componentInterface,
+          viewConfig,
+          extraConfig && extraConfig.nativeOnly,
+        );
+    }
+
+    if (!hasAttachedDefaultEventTypes) {
+      attachDefaultEventTypes(viewConfig);
+      hasAttachedDefaultEventTypes = true;
+    }
+
+    // Register this view's event types with the ReactNative renderer.
+    // This enables view managers to be initialized lazily, improving perf,
+    // While also enabling 3rd party components to define custom event types.
+    ReactNativeBridgeEventPlugin.processEventTypes(viewConfig);
+
+    return viewConfig;
+  }
+
+  return createReactNativeComponentClass(viewName, getViewConfig);
+}
+
+const TypeToDifferMap = {
+  // iOS Types
+  CATransform3D: matricesDiffer,
+  CGPoint: pointsDiffer,
+  CGSize: sizesDiffer,
+  UIEdgeInsets: insetsDiffer,
+  // Android Types
+  // (not yet implemented)
+};
+
+function processColorArray(colors: ?Array<any>): ?Array<?number> {
+  return colors && colors.map(processColor);
+}
+
+const TypeToProcessorMap = {
+  // iOS Types
+  CGColor: processColor,
+  CGColorArray: processColorArray,
+  UIColor: processColor,
+  UIColorArray: processColorArray,
+  CGImage: resolveAssetSource,
+  UIImage: resolveAssetSource,
+  RCTImageSource: resolveAssetSource,
+  // Android Types
+  Color: processColor,
+  ColorArray: processColorArray,
+};
+
+module.exports = requireNativeComponent;
diff --git a/Libraries/ReactNative/requireNativeComponent.js b/Libraries/ReactNative/requireNativeComponent.js
index 763572dc0d00b0..2a6c7c8ca71e8d 100644
--- a/Libraries/ReactNative/requireNativeComponent.js
+++ b/Libraries/ReactNative/requireNativeComponent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule requireNativeComponent
  * @flow
@@ -25,9 +23,6 @@ const processColor = require('processColor');
 const resolveAssetSource = require('resolveAssetSource');
 const sizesDiffer = require('sizesDiffer');
 const verifyPropTypes = require('verifyPropTypes');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const invariant = require('fbjs/lib/invariant');
 const warning = require('fbjs/lib/warning');
 
diff --git a/Libraries/ReactNative/verifyPropTypes.js b/Libraries/ReactNative/verifyPropTypes.js
index cea7fc7bde80e3..7791899d298b2f 100644
--- a/Libraries/ReactNative/verifyPropTypes.js
+++ b/Libraries/ReactNative/verifyPropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule verifyPropTypes
  * @flow
@@ -19,7 +17,7 @@ export type ComponentInterface =
   | {
       name?: string,
       displayName?: string,
-      propTypes: Object,
+      propTypes?: Object,
     };
 
 function verifyPropTypes(
@@ -43,7 +41,7 @@ function verifyPropTypes(
     componentInterface.propTypes;
 
   if (!propTypes) {
-    throw new Error('`' + componentName + '` has no propTypes defined`');
+    return;
   }
 
   var nativeProps = viewConfig.NativeProps;
diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index 981ea0ea492919..fc81a7c7f28c85 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-467b1034ce8af6807e11deb9dfeca4d4e922ed82
\ No newline at end of file
+1c2876d5b558b8591feb335d8d7204bc46f7da8a
\ No newline at end of file
diff --git a/Libraries/Renderer/ReactFabric-dev.js b/Libraries/Renderer/ReactFabric-dev.js
index 475dd17d22ae91..0b7a78516c11ba 100644
--- a/Libraries/Renderer/ReactFabric-dev.js
+++ b/Libraries/Renderer/ReactFabric-dev.js
@@ -19,15 +19,14 @@ require("InitializeCore");
 var invariant = require("fbjs/lib/invariant");
 var warning = require("fbjs/lib/warning");
 var emptyFunction = require("fbjs/lib/emptyFunction");
-var RCTEventEmitter = require("RCTEventEmitter");
 var UIManager = require("UIManager");
-var React = require("react");
 var TextInputState = require("TextInputState");
 var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
+var React = require("react");
 var emptyObject = require("fbjs/lib/emptyObject");
-var checkPropTypes = require("prop-types/checkPropTypes");
 var shallowEqual = require("fbjs/lib/shallowEqual");
+var checkPropTypes = require("prop-types/checkPropTypes");
 var deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev");
 var FabricUIManager = require("FabricUIManager");
 
@@ -510,11 +509,13 @@ var injection$1 = {
     getNodeFromInstance = Injected.getNodeFromInstance;
 
     {
-      warning(
-        getNodeFromInstance && getInstanceFromNode,
-        "EventPluginUtils.injection.injectComponentTree(...): Injected " +
-          "module is missing getNodeFromInstance or getInstanceFromNode."
-      );
+      !(getNodeFromInstance && getInstanceFromNode)
+        ? warning(
+            false,
+            "EventPluginUtils.injection.injectComponentTree(...): Injected " +
+              "module is missing getNodeFromInstance or getInstanceFromNode."
+          )
+        : void 0;
     }
   }
 };
@@ -550,60 +551,15 @@ var validateEventDispatches = void 0;
       ? dispatchInstances.length
       : dispatchInstances ? 1 : 0;
 
-    warning(
-      instancesIsArr === listenersIsArr && instancesLen === listenersLen,
-      "EventPluginUtils: Invalid `event`."
-    );
+    !(instancesIsArr === listenersIsArr && instancesLen === listenersLen)
+      ? warning(false, "EventPluginUtils: Invalid `event`.")
+      : void 0;
   };
 }
 
-/**
- * Dispatch the event to the listener.
- * @param {SyntheticEvent} event SyntheticEvent to handle
- * @param {boolean} simulated If the event is simulated (changes exn behavior)
- * @param {function} listener Application-level callback
- * @param {*} inst Internal component instance
- */
-function executeDispatch(event, simulated, listener, inst) {
-  var type = event.type || "unknown-event";
-  event.currentTarget = getNodeFromInstance(inst);
-  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
-    type,
-    listener,
-    undefined,
-    event
-  );
-  event.currentTarget = null;
-}
-
 /**
  * Standard/simple iteration through an event's collected dispatches.
  */
-function executeDispatchesInOrder(event, simulated) {
-  var dispatchListeners = event._dispatchListeners;
-  var dispatchInstances = event._dispatchInstances;
-  {
-    validateEventDispatches(event);
-  }
-  if (Array.isArray(dispatchListeners)) {
-    for (var i = 0; i < dispatchListeners.length; i++) {
-      if (event.isPropagationStopped()) {
-        break;
-      }
-      // Listeners and Instances are two parallel arrays that are always in sync.
-      executeDispatch(
-        event,
-        simulated,
-        dispatchListeners[i],
-        dispatchInstances[i]
-      );
-    }
-  } else if (dispatchListeners) {
-    executeDispatch(event, simulated, dispatchListeners, dispatchInstances);
-  }
-  event._dispatchListeners = null;
-  event._dispatchInstances = null;
-}
 
 /**
  * Standard/simple iteration through an event's collected dispatches, but stops
@@ -742,35 +698,6 @@ function forEachAccumulated(arr, cb, scope) {
   }
 }
 
-/**
- * Internal queue of events that have accumulated their dispatches and are
- * waiting to have their dispatches executed.
- */
-var eventQueue = null;
-
-/**
- * Dispatches an event and releases it back into the pool, unless persistent.
- *
- * @param {?object} event Synthetic event to be dispatched.
- * @param {boolean} simulated If the event is simulated (changes exn behavior)
- * @private
- */
-var executeDispatchesAndRelease = function(event, simulated) {
-  if (event) {
-    executeDispatchesInOrder(event, simulated);
-
-    if (!event.isPersistent()) {
-      event.constructor.release(event);
-    }
-  }
-};
-var executeDispatchesAndReleaseSimulated = function(e) {
-  return executeDispatchesAndRelease(e, true);
-};
-var executeDispatchesAndReleaseTopLevel = function(e) {
-  return executeDispatchesAndRelease(e, false);
-};
-
 function isInteractive(tag) {
   return (
     tag === "button" ||
@@ -870,87 +797,6 @@ function getListener(inst, registrationName) {
   return listener;
 }
 
-/**
- * Allows registered plugins an opportunity to extract events from top-level
- * native browser events.
- *
- * @return {*} An accumulation of synthetic events.
- * @internal
- */
-function extractEvents(
-  topLevelType,
-  targetInst,
-  nativeEvent,
-  nativeEventTarget
-) {
-  var events = null;
-  for (var i = 0; i < plugins.length; i++) {
-    // Not every plugin in the ordering may be loaded at runtime.
-    var possiblePlugin = plugins[i];
-    if (possiblePlugin) {
-      var extractedEvents = possiblePlugin.extractEvents(
-        topLevelType,
-        targetInst,
-        nativeEvent,
-        nativeEventTarget
-      );
-      if (extractedEvents) {
-        events = accumulateInto(events, extractedEvents);
-      }
-    }
-  }
-  return events;
-}
-
-function runEventsInBatch(events, simulated) {
-  if (events !== null) {
-    eventQueue = accumulateInto(eventQueue, events);
-  }
-
-  // Set `eventQueue` to null before processing it so that we can tell if more
-  // events get enqueued while processing.
-  var processingEventQueue = eventQueue;
-  eventQueue = null;
-
-  if (!processingEventQueue) {
-    return;
-  }
-
-  if (simulated) {
-    forEachAccumulated(
-      processingEventQueue,
-      executeDispatchesAndReleaseSimulated
-    );
-  } else {
-    forEachAccumulated(
-      processingEventQueue,
-      executeDispatchesAndReleaseTopLevel
-    );
-  }
-  invariant(
-    !eventQueue,
-    "processEventQueue(): Additional events were enqueued while processing " +
-      "an event queue. Support for this has not yet been implemented."
-  );
-  // This would be a good time to rethrow if any of the event handlers threw.
-  ReactErrorUtils.rethrowCaughtError();
-}
-
-function runExtractedEventsInBatch(
-  topLevelType,
-  targetInst,
-  nativeEvent,
-  nativeEventTarget
-) {
-  var events = extractEvents(
-    topLevelType,
-    targetInst,
-    nativeEvent,
-    nativeEventTarget
-  );
-  runEventsInBatch(events, false);
-}
-
 var IndeterminateComponent = 0; // Before we know whether it is functional or class
 var FunctionalComponent = 1;
 var ClassComponent = 2;
@@ -965,6 +811,7 @@ var Fragment = 10;
 var Mode = 11;
 var ContextConsumer = 12;
 var ContextProvider = 13;
+var ForwardRef = 14;
 
 function getParent(inst) {
   do {
@@ -1093,7 +940,7 @@ function listenerAtPhase(inst, event, propagationPhase) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   {
-    warning(inst, "Dispatching inst must not be null");
+    !inst ? warning(false, "Dispatching inst must not be null") : void 0;
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
@@ -1412,13 +1259,15 @@ SyntheticEvent.extend = function(Interface) {
               !target.constructor.Interface.hasOwnProperty(prop) &&
               shouldBeReleasedProperties.indexOf(prop) === -1
             ) {
-              warning(
-                didWarnForAddedNewProperty || target.isPersistent(),
-                "This synthetic event is reused for performance reasons. If you're " +
-                  "seeing this, you're adding a new property in the synthetic event object. " +
-                  "The property is never released. See " +
-                  "https://fb.me/react-event-pooling for more information."
-              );
+              !(didWarnForAddedNewProperty || target.isPersistent())
+                ? warning(
+                    false,
+                    "This synthetic event is reused for performance reasons. If you're " +
+                      "seeing this, you're adding a new property in the synthetic event object. " +
+                      "The property is never released. See " +
+                      "https://fb.me/react-event-pooling for more information."
+                  )
+                : void 0;
               didWarnForAddedNewProperty = true;
             }
             target[prop] = value;
@@ -1465,16 +1314,18 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function warn(action, result) {
     var warningCondition = false;
-    warning(
-      warningCondition,
-      "This synthetic event is reused for performance reasons. If you're seeing this, " +
-        "you're %s `%s` on a released/nullified synthetic event. %s. " +
-        "If you must keep the original synthetic event around, use event.persist(). " +
-        "See https://fb.me/react-event-pooling for more information.",
-      action,
-      propName,
-      result
-    );
+    !warningCondition
+      ? warning(
+          false,
+          "This synthetic event is reused for performance reasons. If you're seeing this, " +
+            "you're %s `%s` on a released/nullified synthetic event. %s. " +
+            "If you must keep the original synthetic event around, use event.persist(). " +
+            "See https://fb.me/react-event-pooling for more information.",
+          action,
+          propName,
+          result
+        )
+      : void 0;
   }
 }
 
@@ -1592,13 +1443,15 @@ function getTouchIdentifier(_ref) {
 
   invariant(identifier != null, "Touch object is missing identifier.");
   {
-    warning(
-      identifier <= MAX_TOUCH_BANK,
-      "Touch identifier %s is greater than maximum supported %s which causes " +
-        "performance issues backfilling array locations for all of the indices.",
-      identifier,
-      MAX_TOUCH_BANK
-    );
+    !(identifier <= MAX_TOUCH_BANK)
+      ? warning(
+          false,
+          "Touch identifier %s is greater than maximum supported %s which causes " +
+            "performance issues backfilling array locations for all of the indices.",
+          identifier,
+          MAX_TOUCH_BANK
+        )
+      : void 0;
   }
   return identifier;
 }
@@ -1697,10 +1550,9 @@ var ResponderTouchHistoryStore = {
         }
         {
           var activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
-          warning(
-            activeRecord != null && activeRecord.touchActive,
-            "Cannot find single active touch."
-          );
+          !(activeRecord != null && activeRecord.touchActive)
+            ? warning(false, "Cannot find single active touch.")
+            : void 0;
         }
       }
     }
@@ -2323,6 +2175,10 @@ var ReactNativeBridgeEventPlugin = {
     nativeEvent,
     nativeEventTarget
   ) {
+    if (targetInst == null) {
+      // Probably a node belonging to another renderer's tree.
+      return null;
+    }
     var bubbleDispatchConfig = customBubblingEventTypes[topLevelType];
     var directDispatchConfig = customDirectEventTypes[topLevelType];
     invariant(
@@ -2434,6 +2290,118 @@ var ReactNativeComponentTree = Object.freeze({
   updateFiberProps: updateFiberProps
 });
 
+var ReactNativeEventPluginOrder = [
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+];
+
+// Module provided by RN:
+var ReactNativeGlobalResponderHandler = {
+  onChange: function(from, to, blockNativeResponder) {
+    if (to !== null) {
+      var tag = to.stateNode._nativeTag;
+      UIManager.setJSResponder(tag, blockNativeResponder);
+    } else {
+      UIManager.clearJSResponder();
+    }
+  }
+};
+
+/**
+ * Make sure essential globals are available and are patched correctly. Please don't remove this
+ * line. Bundles created by react-packager `require` it before executing any application code. This
+ * ensures it exists in the dependency graph and can be `require`d.
+ * TODO: require this in packager, not in React #10932517
+ */
+// Module provided by RN:
+/**
+ * Inject module for resolving DOM hierarchy and plugin ordering.
+ */
+injection.injectEventPluginOrder(ReactNativeEventPluginOrder);
+injection$1.injectComponentTree(ReactNativeComponentTree);
+
+ResponderEventPlugin.injection.injectGlobalResponderHandler(
+  ReactNativeGlobalResponderHandler
+);
+
+/**
+ * Some important event plugins included by default (without having to require
+ * them).
+ */
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+});
+
+// TODO: The event emitter registration is interfering with the existing
+// ReactNative renderer. So disable it for Fabric for now.
+
+// import * as ReactNativeEventEmitter from './ReactNativeEventEmitter';
+
+// Module provided by RN:
+// import RCTEventEmitter from 'RCTEventEmitter';
+
+/**
+ * Register the event emitter with the native bridge
+ */
+// RCTEventEmitter.register(ReactNativeEventEmitter);
+
+// The Symbol used to tag the ReactElement-like types. If there is no native Symbol
+// nor polyfill, then a plain number is used for performance.
+var hasSymbol = typeof Symbol === "function" && Symbol["for"];
+
+var REACT_ELEMENT_TYPE = hasSymbol ? Symbol["for"]("react.element") : 0xeac7;
+var REACT_CALL_TYPE = hasSymbol ? Symbol["for"]("react.call") : 0xeac8;
+var REACT_RETURN_TYPE = hasSymbol ? Symbol["for"]("react.return") : 0xeac9;
+var REACT_PORTAL_TYPE = hasSymbol ? Symbol["for"]("react.portal") : 0xeaca;
+var REACT_FRAGMENT_TYPE = hasSymbol ? Symbol["for"]("react.fragment") : 0xeacb;
+var REACT_STRICT_MODE_TYPE = hasSymbol
+  ? Symbol["for"]("react.strict_mode")
+  : 0xeacc;
+var REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 0xeacd;
+var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
+var REACT_ASYNC_MODE_TYPE = hasSymbol
+  ? Symbol["for"]("react.async_mode")
+  : 0xeacf;
+var REACT_FORWARD_REF_TYPE = hasSymbol
+  ? Symbol["for"]("react.forward_ref")
+  : 0xead0;
+
+var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
+var FAUX_ITERATOR_SYMBOL = "@@iterator";
+
+function getIteratorFn(maybeIterable) {
+  if (maybeIterable === null || typeof maybeIterable === "undefined") {
+    return null;
+  }
+  var maybeIterator =
+    (MAYBE_ITERATOR_SYMBOL && maybeIterable[MAYBE_ITERATOR_SYMBOL]) ||
+    maybeIterable[FAUX_ITERATOR_SYMBOL];
+  if (typeof maybeIterator === "function") {
+    return maybeIterator;
+  }
+  return null;
+}
+
+function createPortal(
+  children,
+  containerInfo,
+  // TODO: figure out the API for cross-renderer implementation.
+  implementation
+) {
+  var key =
+    arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+
+  return {
+    // This tag allow us to uniquely identify this as a React Portal
+    $$typeof: REACT_PORTAL_TYPE,
+    key: key == null ? null : "" + key,
+    children: children,
+    containerInfo: containerInfo,
+    implementation: implementation
+  };
+}
+
 // Use to restore controlled state after a change event has fired.
 
 var fiberHostComponent = null;
@@ -2534,332 +2502,32 @@ var injection$2 = {
   }
 };
 
-/**
- * Keeps track of allocating and associating native "tags" which are numeric,
- * unique view IDs. All the native tags are negative numbers, to avoid
- * collisions, but in the JS we keep track of them as positive integers to store
- * them effectively in Arrays. So we must refer to them as "inverses" of the
- * native tags (that are * normally negative).
- *
- * It *must* be the case that every `rootNodeID` always maps to the exact same
- * `tag` forever. The easiest way to accomplish this is to never delete
- * anything from this table.
- * Why: Because `dangerouslyReplaceNodeWithMarkupByID` relies on being able to
- * unmount a component with a `rootNodeID`, then mount a new one in its place,
- */
-var INITIAL_TAG_COUNT = 1;
-var ReactNativeTagHandles = {
-  tagsStartAt: INITIAL_TAG_COUNT,
-  tagCount: INITIAL_TAG_COUNT,
-
-  allocateTag: function() {
-    // Skip over root IDs as those are reserved for native
-    while (this.reactTagIsNativeTopRootID(ReactNativeTagHandles.tagCount)) {
-      ReactNativeTagHandles.tagCount++;
-    }
-    var tag = ReactNativeTagHandles.tagCount;
-    ReactNativeTagHandles.tagCount++;
-    return tag;
-  },
-
-  assertRootTag: function(tag) {
-    invariant(
-      this.reactTagIsNativeTopRootID(tag),
-      "Expect a native root tag, instead got %s",
-      tag
-    );
-  },
-
-  reactTagIsNativeTopRootID: function(reactTag) {
-    // We reserve all tags that are 1 mod 10 for native root views
-    return reactTag % 10 === 1;
-  }
-};
-
-/**
- * Version of `ReactBrowserEventEmitter` that works on the receiving side of a
- * serialized worker boundary.
- */
-
-// Shared default empty native event - conserve memory.
-var EMPTY_NATIVE_EVENT = {};
-
-/**
- * Selects a subsequence of `Touch`es, without destroying `touches`.
- *
- * @param {Array<Touch>} touches Deserialized touch objects.
- * @param {Array<number>} indices Indices by which to pull subsequence.
- * @return {Array<Touch>} Subsequence of touch objects.
- */
-var touchSubsequence = function(touches, indices) {
-  var ret = [];
-  for (var i = 0; i < indices.length; i++) {
-    ret.push(touches[indices[i]]);
-  }
-  return ret;
-};
-
-/**
- * TODO: Pool all of this.
- *
- * Destroys `touches` by removing touch objects at indices `indices`. This is
- * to maintain compatibility with W3C touch "end" events, where the active
- * touches don't include the set that has just been "ended".
- *
- * @param {Array<Touch>} touches Deserialized touch objects.
- * @param {Array<number>} indices Indices to remove from `touches`.
- * @return {Array<Touch>} Subsequence of removed touch objects.
- */
-var removeTouchesAtIndices = function(touches, indices) {
-  var rippedOut = [];
-  // use an unsafe downcast to alias to nullable elements,
-  // so we can delete and then compact.
-  var temp = touches;
-  for (var i = 0; i < indices.length; i++) {
-    var index = indices[i];
-    rippedOut.push(touches[index]);
-    temp[index] = null;
-  }
-  var fillAt = 0;
-  for (var j = 0; j < temp.length; j++) {
-    var cur = temp[j];
-    if (cur !== null) {
-      temp[fillAt++] = cur;
-    }
-  }
-  temp.length = fillAt;
-  return rippedOut;
-};
-
-/**
- * Internal version of `receiveEvent` in terms of normalized (non-tag)
- * `rootNodeID`.
- *
- * @see receiveEvent.
- *
- * @param {rootNodeID} rootNodeID React root node ID that event occurred on.
- * @param {TopLevelType} topLevelType Top level type of event.
- * @param {?object} nativeEventParam Object passed from native.
- */
-function _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam) {
-  var nativeEvent = nativeEventParam || EMPTY_NATIVE_EVENT;
-  var inst = getInstanceFromTag(rootNodeID);
-  batchedUpdates(function() {
-    runExtractedEventsInBatch(
-      topLevelType,
-      inst,
-      nativeEvent,
-      nativeEvent.target
-    );
-  });
-  // React Native doesn't use ReactControlledComponent but if it did, here's
-  // where it would do it.
-}
-
-/**
- * Publicly exposed method on module for native objc to invoke when a top
- * level event is extracted.
- * @param {rootNodeID} rootNodeID React root node ID that event occurred on.
- * @param {TopLevelType} topLevelType Top level type of event.
- * @param {object} nativeEventParam Object passed from native.
- */
-function receiveEvent(rootNodeID, topLevelType, nativeEventParam) {
-  _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam);
-}
-
-/**
- * Simple multi-wrapper around `receiveEvent` that is intended to receive an
- * efficient representation of `Touch` objects, and other information that
- * can be used to construct W3C compliant `Event` and `Touch` lists.
- *
- * This may create dispatch behavior that differs than web touch handling. We
- * loop through each of the changed touches and receive it as a single event.
- * So two `touchStart`/`touchMove`s that occur simultaneously are received as
- * two separate touch event dispatches - when they arguably should be one.
- *
- * This implementation reuses the `Touch` objects themselves as the `Event`s
- * since we dispatch an event for each touch (though that might not be spec
- * compliant). The main purpose of reusing them is to save allocations.
- *
- * TODO: Dispatch multiple changed touches in one event. The bubble path
- * could be the first common ancestor of all the `changedTouches`.
- *
- * One difference between this behavior and W3C spec: cancelled touches will
- * not appear in `.touches`, or in any future `.touches`, though they may
- * still be "actively touching the surface".
- *
- * Web desktop polyfills only need to construct a fake touch event with
- * identifier 0, also abandoning traditional click handlers.
- */
-function receiveTouches(eventTopLevelType, touches, changedIndices) {
-  var changedTouches =
-    eventTopLevelType === "topTouchEnd" ||
-    eventTopLevelType === "topTouchCancel"
-      ? removeTouchesAtIndices(touches, changedIndices)
-      : touchSubsequence(touches, changedIndices);
-
-  for (var jj = 0; jj < changedTouches.length; jj++) {
-    var touch = changedTouches[jj];
-    // Touch objects can fulfill the role of `DOM` `Event` objects if we set
-    // the `changedTouches`/`touches`. This saves allocations.
-    touch.changedTouches = changedTouches;
-    touch.touches = touches;
-    var nativeEvent = touch;
-    var rootNodeID = null;
-    var target = nativeEvent.target;
-    if (target !== null && target !== undefined) {
-      if (target < ReactNativeTagHandles.tagsStartAt) {
-        {
-          warning(
-            false,
-            "A view is reporting that a touch occurred on tag zero."
-          );
-        }
-      } else {
-        rootNodeID = target;
-      }
-    }
-    // $FlowFixMe Shouldn't we *not* call it if rootNodeID is null?
-    _receiveRootNodeIDEvent(rootNodeID, eventTopLevelType, nativeEvent);
-  }
-}
-
-var ReactNativeEventEmitter = Object.freeze({
-  getListener: getListener,
-  registrationNames: registrationNameModules,
-  _receiveRootNodeIDEvent: _receiveRootNodeIDEvent,
-  receiveEvent: receiveEvent,
-  receiveTouches: receiveTouches
-});
-
-var ReactNativeEventPluginOrder = [
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-];
-
-// Module provided by RN:
-var ReactNativeGlobalResponderHandler = {
-  onChange: function(from, to, blockNativeResponder) {
-    if (to !== null) {
-      var tag = to.stateNode._nativeTag;
-      UIManager.setJSResponder(tag, blockNativeResponder);
-    } else {
-      UIManager.clearJSResponder();
-    }
-  }
-};
-
-/**
- * Make sure essential globals are available and are patched correctly. Please don't remove this
- * line. Bundles created by react-packager `require` it before executing any application code. This
- * ensures it exists in the dependency graph and can be `require`d.
- * TODO: require this in packager, not in React #10932517
- */
-// Module provided by RN:
-// Module provided by RN:
-/**
- * Register the event emitter with the native bridge
- */
-RCTEventEmitter.register(ReactNativeEventEmitter);
-
-/**
- * Inject module for resolving DOM hierarchy and plugin ordering.
- */
-injection.injectEventPluginOrder(ReactNativeEventPluginOrder);
-injection$1.injectComponentTree(ReactNativeComponentTree);
-
-ResponderEventPlugin.injection.injectGlobalResponderHandler(
-  ReactNativeGlobalResponderHandler
-);
-
-/**
- * Some important event plugins included by default (without having to require
- * them).
- */
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
-});
-
-// The Symbol used to tag the ReactElement-like types. If there is no native Symbol
-// nor polyfill, then a plain number is used for performance.
-var hasSymbol = typeof Symbol === "function" && Symbol["for"];
-
-var REACT_ELEMENT_TYPE = hasSymbol ? Symbol["for"]("react.element") : 0xeac7;
-var REACT_CALL_TYPE = hasSymbol ? Symbol["for"]("react.call") : 0xeac8;
-var REACT_RETURN_TYPE = hasSymbol ? Symbol["for"]("react.return") : 0xeac9;
-var REACT_PORTAL_TYPE = hasSymbol ? Symbol["for"]("react.portal") : 0xeaca;
-var REACT_FRAGMENT_TYPE = hasSymbol ? Symbol["for"]("react.fragment") : 0xeacb;
-var REACT_STRICT_MODE_TYPE = hasSymbol
-  ? Symbol["for"]("react.strict_mode")
-  : 0xeacc;
-var REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 0xeacd;
-var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
-var REACT_ASYNC_MODE_TYPE = hasSymbol
-  ? Symbol["for"]("react.async_mode")
-  : 0xeacf;
-
-var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
-var FAUX_ITERATOR_SYMBOL = "@@iterator";
-
-function getIteratorFn(maybeIterable) {
-  if (maybeIterable === null || typeof maybeIterable === "undefined") {
-    return null;
-  }
-  var maybeIterator =
-    (MAYBE_ITERATOR_SYMBOL && maybeIterable[MAYBE_ITERATOR_SYMBOL]) ||
-    maybeIterable[FAUX_ITERATOR_SYMBOL];
-  if (typeof maybeIterator === "function") {
-    return maybeIterator;
-  }
-  return null;
-}
-
-function createPortal(
-  children,
-  containerInfo,
-  // TODO: figure out the API for cross-renderer implementation.
-  implementation
-) {
-  var key =
-    arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-
-  return {
-    // This tag allow us to uniquely identify this as a React Portal
-    $$typeof: REACT_PORTAL_TYPE,
-    key: key == null ? null : "" + key,
-    children: children,
-    containerInfo: containerInfo,
-    implementation: implementation
-  };
-}
-
-var TouchHistoryMath = {
-  /**
-   * This code is optimized and not intended to look beautiful. This allows
-   * computing of touch centroids that have moved after `touchesChangedAfter`
-   * timeStamp. You can compute the current centroid involving all touches
-   * moves after `touchesChangedAfter`, or you can compute the previous
-   * centroid of all touches that were moved after `touchesChangedAfter`.
-   *
-   * @param {TouchHistoryMath} touchHistory Standard Responder touch track
-   * data.
-   * @param {number} touchesChangedAfter timeStamp after which moved touches
-   * are considered "actively moving" - not just "active".
-   * @param {boolean} isXAxis Consider `x` dimension vs. `y` dimension.
-   * @param {boolean} ofCurrent Compute current centroid for actively moving
-   * touches vs. previous centroid of now actively moving touches.
-   * @return {number} value of centroid in specified dimension.
-   */
-  centroidDimension: function(
-    touchHistory,
-    touchesChangedAfter,
-    isXAxis,
-    ofCurrent
-  ) {
-    var touchBank = touchHistory.touchBank;
-    var total = 0;
-    var count = 0;
+var TouchHistoryMath = {
+  /**
+   * This code is optimized and not intended to look beautiful. This allows
+   * computing of touch centroids that have moved after `touchesChangedAfter`
+   * timeStamp. You can compute the current centroid involving all touches
+   * moves after `touchesChangedAfter`, or you can compute the previous
+   * centroid of all touches that were moved after `touchesChangedAfter`.
+   *
+   * @param {TouchHistoryMath} touchHistory Standard Responder touch track
+   * data.
+   * @param {number} touchesChangedAfter timeStamp after which moved touches
+   * are considered "actively moving" - not just "active".
+   * @param {boolean} isXAxis Consider `x` dimension vs. `y` dimension.
+   * @param {boolean} ofCurrent Compute current centroid for actively moving
+   * touches vs. previous centroid of now actively moving touches.
+   * @return {number} value of centroid in specified dimension.
+   */
+  centroidDimension: function(
+    touchHistory,
+    touchesChangedAfter,
+    isXAxis,
+    ofCurrent
+  ) {
+    var touchBank = touchHistory.touchBank;
+    var total = 0;
+    var count = 0;
 
     var oneTouchData =
       touchHistory.numberActiveTouches === 1
@@ -2977,19 +2645,9 @@ var TouchHistoryMath = {
   noCentroid: -1
 };
 
-var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-var ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
-var ReactDebugCurrentFrame = ReactInternals.ReactDebugCurrentFrame;
-
-var ReactGlobalSharedState = Object.freeze({
-  ReactCurrentOwner: ReactCurrentOwner,
-  ReactDebugCurrentFrame: ReactDebugCurrentFrame
-});
-
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.0-alpha.0";
+var ReactVersion = "16.3.1";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -3580,6 +3238,11 @@ function set(key, value) {
   key._reactInternalFiber = value;
 }
 
+var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+var ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
+var ReactDebugCurrentFrame = ReactInternals.ReactDebugCurrentFrame;
+
 function getComponentName(fiber) {
   var type = fiber.type;
 
@@ -3654,15 +3317,17 @@ function findNodeHandle(componentOrHandle) {
   {
     var owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
-      warning(
-        owner.stateNode._warnedAboutRefsInRender,
-        "%s is accessing findNodeHandle inside its render(). " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(owner) || "A component"
-      );
+      !owner.stateNode._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing findNodeHandle inside its render(). " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(owner) || "A component"
+          )
+        : void 0;
 
       owner.stateNode._warnedAboutRefsInRender = true;
     }
@@ -3881,6 +3546,8 @@ var NativeMethodsMixin = {
       !NativeMethodsMixin_DEV.UNSAFE_componentWillReceiveProps,
     "Do not override existing functions."
   );
+  // TODO (bvaughn) Remove cWM and cWRP in a future version of React Native,
+  // Once these lifecycles have been remove from the reconciler.
   NativeMethodsMixin_DEV.componentWillMount = function() {
     throwOnStylesProp(this, this.props);
   };
@@ -3893,6 +3560,12 @@ var NativeMethodsMixin = {
   NativeMethodsMixin_DEV.UNSAFE_componentWillReceiveProps = function(newProps) {
     throwOnStylesProp(this, newProps);
   };
+
+  // React may warn about cWM/cWRP/cWU methods being deprecated.
+  // Add a flag to suppress these warnings for this special case.
+  // TODO (bvaughn) Remove this flag once the above methods have been removed.
+  NativeMethodsMixin_DEV.componentWillMount.__suppressDeprecationWarning = true;
+  NativeMethodsMixin_DEV.componentWillReceiveProps.__suppressDeprecationWarning = true;
 }
 
 function _classCallCheck$1(instance, Constructor) {
@@ -3961,6 +3634,11 @@ var ReactNativeComponent = (function(_React$Component) {
   /**
    * Removes focus. This is the opposite of `focus()`.
    */
+
+  /**
+   * Due to bugs in Flow's handling of React.createClass, some fields already
+   * declared in the base class need to be redeclared below.
+   */
   ReactNativeComponent.prototype.blur = function blur() {
     TextInputState.blurTextInput(findNumericNodeHandleFiber(this));
   };
@@ -4107,7 +3785,8 @@ var frameDeadline = 0;
 var frameDeadlineObject = {
   timeRemaining: function() {
     return frameDeadline - now();
-  }
+  },
+  didTimeout: false
 };
 
 function setTimeoutCallback() {
@@ -4181,19 +3860,27 @@ function get$1(name) {
   return viewConfig;
 }
 
-// Don't change these two values:
-var NoEffect = 0;
-var PerformedWork = 1;
+// Don't change these two values. They're used by React Dev Tools.
+var NoEffect = /*              */ 0;
+var PerformedWork = /*         */ 1;
 
 // You can change the rest (and add more).
-var Placement = 2;
-var Update = 4;
-var PlacementAndUpdate = 6;
-var Deletion = 8;
-var ContentReset = 16;
-var Callback = 32;
-var Err = 64;
-var Ref = 128;
+var Placement = /*             */ 2;
+var Update = /*                */ 4;
+var PlacementAndUpdate = /*    */ 6;
+var Deletion = /*              */ 8;
+var ContentReset = /*          */ 16;
+var Callback = /*              */ 32;
+var DidCapture = /*            */ 64;
+var Ref = /*                   */ 128;
+var ErrLog = /*                */ 256;
+var Snapshot = /*              */ 2048;
+
+// Union of all host effects
+var HostEffectMask = /*        */ 2559;
+
+var Incomplete = /*            */ 512;
+var ShouldCapture = /*         */ 1024;
 
 var MOUNTING = 1;
 var MOUNTED = 2;
@@ -4238,15 +3925,17 @@ function isMounted(component) {
     if (owner !== null && owner.tag === ClassComponent) {
       var ownerFiber = owner;
       var instance = ownerFiber.stateNode;
-      warning(
-        instance._warnedAboutRefsInRender,
-        "%s is accessing isMounted inside its render() function. " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(ownerFiber) || "A component"
-      );
+      !instance._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing isMounted inside its render() function. " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(ownerFiber) || "A component"
+          )
+        : void 0;
       instance._warnedAboutRefsInRender = true;
     }
   }
@@ -4457,1641 +4146,1389 @@ function findCurrentHostFiberWithNoPortals(parent) {
   return null;
 }
 
-var valueStack = [];
+// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
+// Math.pow(2, 30) - 1
+// 0b111111111111111111111111111111
+var MAX_SIGNED_31_BIT_INT = 1073741823;
 
-var fiberStack = void 0;
+// TODO: Use an opaque type once ESLint et al support the syntax
 
-{
-  fiberStack = [];
-}
+var NoWork = 0;
+var Sync = 1;
+var Never = MAX_SIGNED_31_BIT_INT;
 
-var index = -1;
+var UNIT_SIZE = 10;
+var MAGIC_NUMBER_OFFSET = 2;
 
-function createCursor(defaultValue) {
-  return {
-    current: defaultValue
-  };
+// 1 unit of expiration time represents 10ms.
+function msToExpirationTime(ms) {
+  // Always add an offset so that we don't clash with the magic number for NoWork.
+  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
 }
 
-function pop(cursor, fiber) {
-  if (index < 0) {
-    {
-      warning(false, "Unexpected pop.");
-    }
-    return;
-  }
-
-  {
-    if (fiber !== fiberStack[index]) {
-      warning(false, "Unexpected Fiber popped.");
-    }
-  }
-
-  cursor.current = valueStack[index];
-
-  valueStack[index] = null;
-
-  {
-    fiberStack[index] = null;
-  }
-
-  index--;
+function expirationTimeToMs(expirationTime) {
+  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
 }
 
-function push(cursor, value, fiber) {
-  index++;
-
-  valueStack[index] = cursor.current;
-
-  {
-    fiberStack[index] = fiber;
-  }
+function ceiling(num, precision) {
+  return (((num / precision) | 0) + 1) * precision;
+}
 
-  cursor.current = value;
+function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
+  return ceiling(
+    currentTime + expirationInMs / UNIT_SIZE,
+    bucketSizeMs / UNIT_SIZE
+  );
 }
 
-function reset() {
-  while (index > -1) {
-    valueStack[index] = null;
+var NoContext = 0;
+var AsyncMode = 1;
+var StrictMode = 2;
 
-    {
-      fiberStack[index] = null;
-    }
+var hasBadMapPolyfill = void 0;
 
-    index--;
+{
+  hasBadMapPolyfill = false;
+  try {
+    var nonExtensibleObject = Object.preventExtensions({});
+    var testMap = new Map([[nonExtensibleObject, null]]);
+    var testSet = new Set([nonExtensibleObject]);
+    // This is necessary for Rollup to not consider these unused.
+    // https://github.com/rollup/rollup/issues/1771
+    // TODO: we can remove these if Rollup fixes the bug.
+    testMap.set(0, 0);
+    testSet.add(0);
+  } catch (e) {
+    // TODO: Consider warning about bad polyfills
+    hasBadMapPolyfill = true;
   }
 }
 
-var describeComponentFrame = function(name, source, ownerName) {
-  return (
-    "\n    in " +
-    (name || "Unknown") +
-    (source
-      ? " (at " +
-        source.fileName.replace(/^.*[\\\/]/, "") +
-        ":" +
-        source.lineNumber +
-        ")"
-      : ownerName ? " (created by " + ownerName + ")" : "")
-  );
-};
+// A Fiber is work on a Component that needs to be done or was done. There can
+// be more than one per component.
 
-function describeFiber(fiber) {
-  switch (fiber.tag) {
-    case IndeterminateComponent:
-    case FunctionalComponent:
-    case ClassComponent:
-    case HostComponent:
-      var owner = fiber._debugOwner;
-      var source = fiber._debugSource;
-      var name = getComponentName(fiber);
-      var ownerName = null;
-      if (owner) {
-        ownerName = getComponentName(owner);
-      }
-      return describeComponentFrame(name, source, ownerName);
-    default:
-      return "";
-  }
-}
+var debugCounter = void 0;
 
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  var node = workInProgress;
-  do {
-    info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
-    node = node["return"];
-  } while (node);
-  return info;
+{
+  debugCounter = 1;
 }
 
-function getCurrentFiberOwnerName() {
-  {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    var owner = fiber._debugOwner;
-    if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner);
-    }
-  }
-  return null;
-}
+function FiberNode(tag, pendingProps, key, mode) {
+  // Instance
+  this.tag = tag;
+  this.key = key;
+  this.type = null;
+  this.stateNode = null;
+
+  // Fiber
+  this["return"] = null;
+  this.child = null;
+  this.sibling = null;
+  this.index = 0;
+
+  this.ref = null;
+
+  this.pendingProps = pendingProps;
+  this.memoizedProps = null;
+  this.updateQueue = null;
+  this.memoizedState = null;
+
+  this.mode = mode;
+
+  // Effects
+  this.effectTag = NoEffect;
+  this.nextEffect = null;
+
+  this.firstEffect = null;
+  this.lastEffect = null;
+
+  this.expirationTime = NoWork;
+
+  this.alternate = null;
 
-function getCurrentFiberStackAddendum() {
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
+    this._debugID = debugCounter++;
+    this._debugSource = null;
+    this._debugOwner = null;
+    this._debugIsCurrentlyTiming = false;
+    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
+      Object.preventExtensions(this);
     }
-    // Safe because if current fiber exists, we are reconciling,
-    // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
   }
-  return null;
 }
 
-function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
-}
+// This is a constructor function, rather than a POJO constructor, still
+// please ensure we do the following:
+// 1) Nobody should add any instance methods on this. Instance methods can be
+//    more difficult to predict when they get optimized and they are almost
+//    never inlined properly in static compilers.
+// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
+//    always know when it is a fiber.
+// 3) We might want to experiment with using numeric keys since they are easier
+//    to optimize in a non-JIT environment.
+// 4) We can easily go from a constructor to a createFiber object literal if that
+//    is faster.
+// 5) It should be easy to port this to a C struct and keep a C implementation
+//    compatible.
+var createFiber = function(tag, pendingProps, key, mode) {
+  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
+  return new FiberNode(tag, pendingProps, key, mode);
+};
 
-function setCurrentFiber(fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
+function shouldConstruct(Component) {
+  return !!(Component.prototype && Component.prototype.isReactComponent);
 }
 
-function setCurrentPhase(phase) {
-  ReactDebugCurrentFiber.phase = phase;
-}
+// This is used to create an alternate fiber to do work on.
+function createWorkInProgress(current, pendingProps, expirationTime) {
+  var workInProgress = current.alternate;
+  if (workInProgress === null) {
+    // We use a double buffering pooling technique because we know that we'll
+    // only ever need at most two versions of a tree. We pool the "other" unused
+    // node that we're free to reuse. This is lazily created to avoid allocating
+    // extra objects for things that are never updated. It also allow us to
+    // reclaim the extra memory if needed.
+    workInProgress = createFiber(
+      current.tag,
+      pendingProps,
+      current.key,
+      current.mode
+    );
+    workInProgress.type = current.type;
+    workInProgress.stateNode = current.stateNode;
 
-var ReactDebugCurrentFiber = {
-  current: null,
-  phase: null,
-  resetCurrentFiber: resetCurrentFiber,
-  setCurrentFiber: setCurrentFiber,
-  setCurrentPhase: setCurrentPhase,
-  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
-};
+    {
+      // DEV-only fields
+      workInProgress._debugID = current._debugID;
+      workInProgress._debugSource = current._debugSource;
+      workInProgress._debugOwner = current._debugOwner;
+    }
 
-var debugRenderPhaseSideEffects = false;
-var debugRenderPhaseSideEffectsForStrictMode = false;
+    workInProgress.alternate = current;
+    current.alternate = workInProgress;
+  } else {
+    workInProgress.pendingProps = pendingProps;
 
-var enableUserTimingAPI = true;
-var warnAboutDeprecatedLifecycles = false;
+    // We already have an alternate.
+    // Reset the effect tag.
+    workInProgress.effectTag = NoEffect;
 
-// React Fabric uses persistent reconciler.
-var enableMutatingReconciler = false;
-var enableNoopReconciler = false;
-var enablePersistentReconciler = true;
+    // The effect list is no longer valid.
+    workInProgress.nextEffect = null;
+    workInProgress.firstEffect = null;
+    workInProgress.lastEffect = null;
+  }
 
-// Only used in www builds.
+  workInProgress.expirationTime = expirationTime;
 
-// Prefix measurements so that it's possible to filter them.
-// Longer prefixes are hard to read in DevTools.
-var reactEmoji = "\u269B";
-var warningEmoji = "\u26D4";
-var supportsUserTiming =
-  typeof performance !== "undefined" &&
-  typeof performance.mark === "function" &&
-  typeof performance.clearMarks === "function" &&
-  typeof performance.measure === "function" &&
-  typeof performance.clearMeasures === "function";
+  workInProgress.child = current.child;
+  workInProgress.memoizedProps = current.memoizedProps;
+  workInProgress.memoizedState = current.memoizedState;
+  workInProgress.updateQueue = current.updateQueue;
 
-// Keep track of current fiber so that we know the path to unwind on pause.
-// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
-var currentFiber = null;
-// If we're in the middle of user code, which fiber and method is it?
-// Reusing `currentFiber` would be confusing for this because user code fiber
-// can change during commit phase too, but we don't need to unwind it (since
-// lifecycles in the commit phase don't resemble a tree).
-var currentPhase = null;
-var currentPhaseFiber = null;
-// Did lifecycle hook schedule an update? This is often a performance problem,
-// so we will keep track of it, and include it in the report.
-// Track commits caused by cascading updates.
-var isCommitting = false;
-var hasScheduledUpdateInCurrentCommit = false;
-var hasScheduledUpdateInCurrentPhase = false;
-var commitCountInCurrentWorkLoop = 0;
-var effectCountInCurrentCommit = 0;
-var isWaitingForCallback = false;
-// During commits, we only show a measurement once per method name
-// to avoid stretch the commit phase with measurement overhead.
-var labelsInCurrentCommit = new Set();
-
-var formatMarkName = function(markName) {
-  return reactEmoji + " " + markName;
-};
-
-var formatLabel = function(label, warning$$1) {
-  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
-  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
-  return "" + prefix + label + suffix;
-};
-
-var beginMark = function(markName) {
-  performance.mark(formatMarkName(markName));
-};
-
-var clearMark = function(markName) {
-  performance.clearMarks(formatMarkName(markName));
-};
-
-var endMark = function(label, markName, warning$$1) {
-  var formattedMarkName = formatMarkName(markName);
-  var formattedLabel = formatLabel(label, warning$$1);
-  try {
-    performance.measure(formattedLabel, formattedMarkName);
-  } catch (err) {}
-  // If previous mark was missing for some reason, this will throw.
-  // This could only happen if React crashed in an unexpected place earlier.
-  // Don't pile on with more errors.
-
-  // Clear marks immediately to avoid growing buffer.
-  performance.clearMarks(formattedMarkName);
-  performance.clearMeasures(formattedLabel);
-};
-
-var getFiberMarkName = function(label, debugID) {
-  return label + " (#" + debugID + ")";
-};
-
-var getFiberLabel = function(componentName, isMounted, phase) {
-  if (phase === null) {
-    // These are composite component total time measurements.
-    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
-  } else {
-    // Composite component methods.
-    return componentName + "." + phase;
-  }
-};
-
-var beginFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-
-  if (isCommitting && labelsInCurrentCommit.has(label)) {
-    // During the commit phase, we don't show duplicate labels because
-    // there is a fixed overhead for every measurement, and we don't
-    // want to stretch the commit phase beyond necessary.
-    return false;
-  }
-  labelsInCurrentCommit.add(label);
-
-  var markName = getFiberMarkName(label, debugID);
-  beginMark(markName);
-  return true;
-};
-
-var clearFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  clearMark(markName);
-};
-
-var endFiberMark = function(fiber, phase, warning$$1) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  endMark(label, markName, warning$$1);
-};
-
-var shouldIgnoreFiber = function(fiber) {
-  // Host components should be skipped in the timeline.
-  // We could check typeof fiber.type, but does this work with RN?
-  switch (fiber.tag) {
-    case HostRoot:
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case CallComponent:
-    case ReturnComponent:
-    case Fragment:
-      return true;
-    default:
-      return false;
-  }
-};
-
-var clearPendingPhaseMeasurement = function() {
-  if (currentPhase !== null && currentPhaseFiber !== null) {
-    clearFiberMark(currentPhaseFiber, currentPhase);
-  }
-  currentPhaseFiber = null;
-  currentPhase = null;
-  hasScheduledUpdateInCurrentPhase = false;
-};
-
-var pauseTimers = function() {
-  // Stops all currently active measurements so that they can be resumed
-  // if we continue in a later deferred loop from the same unit of work.
-  var fiber = currentFiber;
-  while (fiber) {
-    if (fiber._debugIsCurrentlyTiming) {
-      endFiberMark(fiber, null, null);
-    }
-    fiber = fiber["return"];
-  }
-};
-
-var resumeTimersRecursively = function(fiber) {
-  if (fiber["return"] !== null) {
-    resumeTimersRecursively(fiber["return"]);
-  }
-  if (fiber._debugIsCurrentlyTiming) {
-    beginFiberMark(fiber, null);
-  }
-};
-
-var resumeTimers = function() {
-  // Resumes all measurements that were active during the last deferred loop.
-  if (currentFiber !== null) {
-    resumeTimersRecursively(currentFiber);
-  }
-};
-
-function recordEffect() {
-  if (enableUserTimingAPI) {
-    effectCountInCurrentCommit++;
-  }
-}
-
-function recordScheduleUpdate() {
-  if (enableUserTimingAPI) {
-    if (isCommitting) {
-      hasScheduledUpdateInCurrentCommit = true;
-    }
-    if (
-      currentPhase !== null &&
-      currentPhase !== "componentWillMount" &&
-      currentPhase !== "componentWillReceiveProps"
-    ) {
-      hasScheduledUpdateInCurrentPhase = true;
-    }
-  }
-}
-
-function startRequestCallbackTimer() {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming && !isWaitingForCallback) {
-      isWaitingForCallback = true;
-      beginMark("(Waiting for async callback...)");
-    }
-  }
-}
-
-function stopRequestCallbackTimer(didExpire) {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming) {
-      isWaitingForCallback = false;
-      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
-      endMark(
-        "(Waiting for async callback...)",
-        "(Waiting for async callback...)",
-        warning$$1
-      );
-    }
-  }
-}
-
-function startWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, this is the fiber to unwind from.
-    currentFiber = fiber;
-    if (!beginFiberMark(fiber, null)) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = true;
-  }
-}
-
-function cancelWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // Remember we shouldn't complete measurement for this fiber.
-    // Otherwise flamechart will be deep even for small updates.
-    fiber._debugIsCurrentlyTiming = false;
-    clearFiberMark(fiber, null);
-  }
-}
-
-function stopWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    endFiberMark(fiber, null, null);
-  }
-}
-
-function stopFailedWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    var warning$$1 = "An error was thrown inside this error boundary";
-    endFiberMark(fiber, null, warning$$1);
-  }
-}
-
-function startPhaseTimer(fiber, phase) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    clearPendingPhaseMeasurement();
-    if (!beginFiberMark(fiber, phase)) {
-      return;
-    }
-    currentPhaseFiber = fiber;
-    currentPhase = phase;
-  }
-}
-
-function stopPhaseTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    if (currentPhase !== null && currentPhaseFiber !== null) {
-      var warning$$1 = hasScheduledUpdateInCurrentPhase
-        ? "Scheduled a cascading update"
-        : null;
-      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
-    }
-    currentPhase = null;
-    currentPhaseFiber = null;
-  }
-}
-
-function startWorkLoopTimer(nextUnitOfWork) {
-  if (enableUserTimingAPI) {
-    currentFiber = nextUnitOfWork;
-    if (!supportsUserTiming) {
-      return;
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // This is top level call.
-    // Any other measurements are performed within.
-    beginMark("(React Tree Reconciliation)");
-    // Resume any measurements that were in progress during the last loop.
-    resumeTimers();
-  }
-}
-
-function stopWorkLoopTimer(interruptedBy) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var warning$$1 = null;
-    if (interruptedBy !== null) {
-      if (interruptedBy.tag === HostRoot) {
-        warning$$1 = "A top-level update interrupted the previous render";
-      } else {
-        var componentName = getComponentName(interruptedBy) || "Unknown";
-        warning$$1 =
-          "An update to " + componentName + " interrupted the previous render";
-      }
-    } else if (commitCountInCurrentWorkLoop > 1) {
-      warning$$1 = "There were cascading updates";
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // Pause any measurements until the next loop.
-    pauseTimers();
-    endMark(
-      "(React Tree Reconciliation)",
-      "(React Tree Reconciliation)",
-      warning$$1
-    );
-  }
-}
-
-function startCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    isCommitting = true;
-    hasScheduledUpdateInCurrentCommit = false;
-    labelsInCurrentCommit.clear();
-    beginMark("(Committing Changes)");
-  }
-}
-
-function stopCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-
-    var warning$$1 = null;
-    if (hasScheduledUpdateInCurrentCommit) {
-      warning$$1 = "Lifecycle hook scheduled a cascading update";
-    } else if (commitCountInCurrentWorkLoop > 0) {
-      warning$$1 = "Caused by a cascading update in earlier commit";
-    }
-    hasScheduledUpdateInCurrentCommit = false;
-    commitCountInCurrentWorkLoop++;
-    isCommitting = false;
-    labelsInCurrentCommit.clear();
+  // These will be overridden during the parent's reconciliation
+  workInProgress.sibling = current.sibling;
+  workInProgress.index = current.index;
+  workInProgress.ref = current.ref;
 
-    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
-  }
+  return workInProgress;
 }
 
-function startCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Committing Host Effects)");
-  }
+function createHostRootFiber(isAsync) {
+  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
+  return createFiber(HostRoot, null, null, mode);
 }
 
-function stopCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Committing Host Effects: " + count + " Total)",
-      "(Committing Host Effects)",
-      null
-    );
+function createFiberFromElement(element, mode, expirationTime) {
+  var owner = null;
+  {
+    owner = element._owner;
   }
-}
 
-function startCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Calling Lifecycle Methods)");
-  }
-}
+  var fiber = void 0;
+  var type = element.type;
+  var key = element.key;
+  var pendingProps = element.props;
 
-function stopCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+  var fiberTag = void 0;
+  if (typeof type === "function") {
+    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
+  } else if (typeof type === "string") {
+    fiberTag = HostComponent;
+  } else {
+    switch (type) {
+      case REACT_FRAGMENT_TYPE:
+        return createFiberFromFragment(
+          pendingProps.children,
+          mode,
+          expirationTime,
+          key
+        );
+      case REACT_ASYNC_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= AsyncMode | StrictMode;
+        break;
+      case REACT_STRICT_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= StrictMode;
+        break;
+      case REACT_CALL_TYPE:
+        fiberTag = CallComponent;
+        break;
+      case REACT_RETURN_TYPE:
+        fiberTag = ReturnComponent;
+        break;
+      default: {
+        if (typeof type === "object" && type !== null) {
+          switch (type.$$typeof) {
+            case REACT_PROVIDER_TYPE:
+              fiberTag = ContextProvider;
+              break;
+            case REACT_CONTEXT_TYPE:
+              // This is a consumer
+              fiberTag = ContextConsumer;
+              break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = ForwardRef;
+              break;
+            default:
+              if (typeof type.tag === "number") {
+                // Currently assumed to be a continuation and therefore is a
+                // fiber already.
+                // TODO: The yield system is currently broken for updates in
+                // some cases. The reified yield stores a fiber, but we don't
+                // know which fiber that is; the current or a workInProgress?
+                // When the continuation gets rendered here we don't know if we
+                // can reuse that fiber or if we need to clone it. There is
+                // probably a clever way to restructure this.
+                fiber = type;
+                fiber.pendingProps = pendingProps;
+                fiber.expirationTime = expirationTime;
+                return fiber;
+              } else {
+                throwOnInvalidElementType(type, owner);
+              }
+              break;
+          }
+        } else {
+          throwOnInvalidElementType(type, owner);
+        }
+      }
     }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Calling Lifecycle Methods: " + count + " Total)",
-      "(Calling Lifecycle Methods)",
-      null
-    );
   }
-}
 
-var warnedAboutMissingGetChildContext = void 0;
-
-{
-  warnedAboutMissingGetChildContext = {};
-}
-
-// A cursor to the current merged context object on the stack.
-var contextStackCursor = createCursor(emptyObject);
-// A cursor to a boolean indicating whether the context has changed.
-var didPerformWorkStackCursor = createCursor(false);
-// Keep track of the previous context object that was on the stack.
-// We use this to get access to the parent context after we have already
-// pushed the next context provider, and now need to merge their contexts.
-var previousContext = emptyObject;
+  fiber = createFiber(fiberTag, pendingProps, key, mode);
+  fiber.type = type;
+  fiber.expirationTime = expirationTime;
 
-function getUnmaskedContext(workInProgress) {
-  var hasOwnContext = isContextProvider(workInProgress);
-  if (hasOwnContext) {
-    // If the fiber is a context provider itself, when we read its context
-    // we have already pushed its own child context on the stack. A context
-    // provider should not "see" its own child context. Therefore we read the
-    // previous (parent) context instead for a context provider.
-    return previousContext;
+  {
+    fiber._debugSource = element._source;
+    fiber._debugOwner = element._owner;
   }
-  return contextStackCursor.current;
-}
 
-function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-  var instance = workInProgress.stateNode;
-  instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-  instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  return fiber;
 }
 
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var type = workInProgress.type;
-  var contextTypes = type.contextTypes;
-  if (!contextTypes) {
-    return emptyObject;
-  }
-
-  // Avoid recreating masked context unless unmasked context has changed.
-  // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-  // This may trigger infinite loops if componentWillReceiveProps calls setState.
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  ) {
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  }
-
-  var context = {};
-  for (var key in contextTypes) {
-    context[key] = unmaskedContext[key];
-  }
-
+function throwOnInvalidElementType(type, owner) {
+  var info = "";
   {
-    var name = getComponentName(workInProgress) || "Unknown";
-    checkPropTypes(
-      contextTypes,
-      context,
-      "context",
-      name,
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
-  }
-
-  // Cache unmasked context so we can avoid recreating masked context unless necessary.
-  // Context is created before the class component is instantiated so check for instance.
-  if (instance) {
-    cacheContext(workInProgress, unmaskedContext, context);
+    if (
+      type === undefined ||
+      (typeof type === "object" &&
+        type !== null &&
+        Object.keys(type).length === 0)
+    ) {
+      info +=
+        " You likely forgot to export your component from the file " +
+        "it's defined in, or you might have mixed up default and " +
+        "named imports.";
+    }
+    var ownerName = owner ? getComponentName(owner) : null;
+    if (ownerName) {
+      info += "\n\nCheck the render method of `" + ownerName + "`.";
+    }
   }
-
-  return context;
+  invariant(
+    false,
+    "Element type is invalid: expected a string (for built-in " +
+      "components) or a class/function (for composite components) " +
+      "but got: %s.%s",
+    type == null ? type : typeof type,
+    info
+  );
 }
 
-function hasContextChanged() {
-  return didPerformWorkStackCursor.current;
+function createFiberFromFragment(elements, mode, expirationTime, key) {
+  var fiber = createFiber(Fragment, elements, key, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function isContextConsumer(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
+function createFiberFromText(content, mode, expirationTime) {
+  var fiber = createFiber(HostText, content, null, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function isContextProvider(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+function createFiberFromHostInstanceForDeletion() {
+  var fiber = createFiber(HostComponent, null, null, NoContext);
+  fiber.type = "DELETED";
+  return fiber;
 }
 
-function popContextProvider(fiber) {
-  if (!isContextProvider(fiber)) {
-    return;
-  }
-
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
+function createFiberFromPortal(portal, mode, expirationTime) {
+  var pendingProps = portal.children !== null ? portal.children : [];
+  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
+  fiber.expirationTime = expirationTime;
+  fiber.stateNode = {
+    containerInfo: portal.containerInfo,
+    pendingChildren: null, // Used by persistent updates
+    implementation: portal.implementation
+  };
+  return fiber;
 }
 
-function popTopLevelContextObject(fiber) {
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
+// Used for stashing WIP properties to replay failed work in DEV.
+function assignFiberPropertiesInDEV(target, source) {
+  if (target === null) {
+    // This Fiber's initial properties will always be overwritten.
+    // We only use a Fiber to ensure the same hidden class so DEV isn't slow.
+    target = createFiber(IndeterminateComponent, null, null, NoContext);
+  }
+
+  // This is intentionally written as a list of all properties.
+  // We tried to use Object.assign() instead but this is called in
+  // the hottest path, and Object.assign() was too slow:
+  // https://github.com/facebook/react/issues/12502
+  // This code is DEV-only so size is not a concern.
+
+  target.tag = source.tag;
+  target.key = source.key;
+  target.type = source.type;
+  target.stateNode = source.stateNode;
+  target["return"] = source["return"];
+  target.child = source.child;
+  target.sibling = source.sibling;
+  target.index = source.index;
+  target.ref = source.ref;
+  target.pendingProps = source.pendingProps;
+  target.memoizedProps = source.memoizedProps;
+  target.updateQueue = source.updateQueue;
+  target.memoizedState = source.memoizedState;
+  target.mode = source.mode;
+  target.effectTag = source.effectTag;
+  target.nextEffect = source.nextEffect;
+  target.firstEffect = source.firstEffect;
+  target.lastEffect = source.lastEffect;
+  target.expirationTime = source.expirationTime;
+  target.alternate = source.alternate;
+  target._debugID = source._debugID;
+  target._debugSource = source._debugSource;
+  target._debugOwner = source._debugOwner;
+  target._debugIsCurrentlyTiming = source._debugIsCurrentlyTiming;
+  return target;
 }
 
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    contextStackCursor.cursor == null,
-    "Unexpected context found on stack. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
+// TODO: This should be lifted into the renderer.
 
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
+function createFiberRoot(containerInfo, isAsync, hydrate) {
+  // Cyclic construction. This cheats the type system right now because
+  // stateNode is any.
+  var uninitializedFiber = createHostRootFiber(isAsync);
+  var root = {
+    current: uninitializedFiber,
+    containerInfo: containerInfo,
+    pendingChildren: null,
+    pendingCommitExpirationTime: NoWork,
+    finishedWork: null,
+    context: null,
+    pendingContext: null,
+    hydrate: hydrate,
+    remainingExpirationTime: NoWork,
+    firstBatch: null,
+    nextScheduledRoot: null
+  };
+  uninitializedFiber.stateNode = root;
+  return root;
 }
 
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode;
-  var childContextTypes = fiber.type.childContextTypes;
-
-  // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-  // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-  if (typeof instance.getChildContext !== "function") {
-    {
-      var componentName = getComponentName(fiber) || "Unknown";
+var onCommitFiberRoot = null;
+var onCommitFiberUnmount = null;
+var hasLoggedError = false;
 
-      if (!warnedAboutMissingGetChildContext[componentName]) {
-        warnedAboutMissingGetChildContext[componentName] = true;
-        warning(
-          false,
-          "%s.childContextTypes is specified but there is no getChildContext() method " +
-            "on the instance. You can either define getChildContext() on %s or remove " +
-            "childContextTypes from it.",
-          componentName,
-          componentName
-        );
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {
+      if (true && !hasLoggedError) {
+        hasLoggedError = true;
+        warning(false, "React DevTools encountered an error: %s", err);
       }
     }
-    return parentContext;
-  }
-
-  var childContext = void 0;
-  {
-    ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
-  }
-  startPhaseTimer(fiber, "getChildContext");
-  childContext = instance.getChildContext();
-  stopPhaseTimer();
-  {
-    ReactDebugCurrentFiber.setCurrentPhase(null);
-  }
-  for (var contextKey in childContext) {
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
-  }
-  {
-    var name = getComponentName(fiber) || "Unknown";
-    checkPropTypes(
-      childContextTypes,
-      childContext,
-      "child context",
-      name,
-      // In practice, there is one case in which we won't get a stack. It's when
-      // somebody calls unstable_renderSubtreeIntoContainer() and we process
-      // context from the parent component instance. The stack will be missing
-      // because it's outside of the reconciliation, and so the pointer has not
-      // been set. This is rare and doesn't matter. We'll also remove that API.
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
-  }
-
-  return Object.assign({}, parentContext, childContext);
+  };
 }
 
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) {
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
     return false;
   }
-
-  var instance = workInProgress.stateNode;
-  // We push the context as early as possible to ensure stack integrity.
-  // If the instance does not exist yet, we will push null at first,
-  // and replace it on the stack later when invalidating the context.
-  var memoizedMergedChildContext =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-
-  // Remember the parent context so we can merge with it later.
-  // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
-
-  return true;
-}
-
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
-
-  if (didChange) {
-    // Merge parent and own context.
-    // Skip this if we're not updating due to sCU.
-    // This avoids unnecessarily recomputing memoized values.
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-
-    // Replace the old (or empty) context with the new one.
-    // It is important to unwind the context in the reverse order.
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    // Now push the new context and mark that it has changed.
-    push(contextStackCursor, mergedContext, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
-  } else {
-    pop(didPerformWorkStackCursor, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
   }
-}
-
-function resetContext() {
-  previousContext = emptyObject;
-  contextStackCursor.current = emptyObject;
-  didPerformWorkStackCursor.current = false;
-}
-
-function findCurrentUnmaskedContext(fiber) {
-  // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-  // makes sense elsewhere
-  invariant(
-    isFiberMounted(fiber) && fiber.tag === ClassComponent,
-    "Expected subtree parent to be a mounted class component. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
-
-  var node = fiber;
-  while (node.tag !== HostRoot) {
-    if (isContextProvider(node)) {
-      return node.stateNode.__reactInternalMemoizedMergedChildContext;
+  if (!hook.supportsFiber) {
+    {
+      warning(
+        false,
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://fb.me/react-devtools"
+      );
     }
-    var parent = node["return"];
-    invariant(
-      parent,
-      "Found unexpected detached subtree parent. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-    node = parent;
+    // DevTools exists, even though it doesn't support Fiber.
+    return true;
   }
-  return node.stateNode.context;
-}
-
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
-
-// TODO: Use an opaque type once ESLint et al support the syntax
-
-var NoWork = 0;
-var Sync = 1;
-var Never = MAX_SIGNED_31_BIT_INT;
-
-var UNIT_SIZE = 10;
-var MAGIC_NUMBER_OFFSET = 2;
-
-// 1 unit of expiration time represents 10ms.
-function msToExpirationTime(ms) {
-  // Always add an offset so that we don't clash with the magic number for NoWork.
-  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
+  try {
+    var rendererID = hook.inject(internals);
+    // We have successfully injected, so now it is safe to set up hooks.
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      warning(false, "React DevTools encountered an error: %s.", err);
+    }
+  }
+  // DevTools exists
+  return true;
 }
 
-function expirationTimeToMs(expirationTime) {
-  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
+function onCommitRoot(root) {
+  if (typeof onCommitFiberRoot === "function") {
+    onCommitFiberRoot(root);
+  }
 }
 
-function ceiling(num, precision) {
-  return (((num / precision) | 0) + 1) * precision;
+function onCommitUnmount(fiber) {
+  if (typeof onCommitFiberUnmount === "function") {
+    onCommitFiberUnmount(fiber);
+  }
 }
 
-function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
-  return ceiling(
-    currentTime + expirationInMs / UNIT_SIZE,
-    bucketSizeMs / UNIT_SIZE
+var describeComponentFrame = function(name, source, ownerName) {
+  return (
+    "\n    in " +
+    (name || "Unknown") +
+    (source
+      ? " (at " +
+        source.fileName.replace(/^.*[\\\/]/, "") +
+        ":" +
+        source.lineNumber +
+        ")"
+      : ownerName ? " (created by " + ownerName + ")" : "")
   );
-}
-
-var NoContext = 0;
-var AsyncMode = 1;
-var StrictMode = 2;
-
-var hasBadMapPolyfill = void 0;
+};
 
-{
-  hasBadMapPolyfill = false;
-  try {
-    var nonExtensibleObject = Object.preventExtensions({});
-    var testMap = new Map([[nonExtensibleObject, null]]);
-    var testSet = new Set([nonExtensibleObject]);
-    // This is necessary for Rollup to not consider these unused.
-    // https://github.com/rollup/rollup/issues/1771
-    // TODO: we can remove these if Rollup fixes the bug.
-    testMap.set(0, 0);
-    testSet.add(0);
-  } catch (e) {
-    // TODO: Consider warning about bad polyfills
-    hasBadMapPolyfill = true;
+function describeFiber(fiber) {
+  switch (fiber.tag) {
+    case IndeterminateComponent:
+    case FunctionalComponent:
+    case ClassComponent:
+    case HostComponent:
+      var owner = fiber._debugOwner;
+      var source = fiber._debugSource;
+      var name = getComponentName(fiber);
+      var ownerName = null;
+      if (owner) {
+        ownerName = getComponentName(owner);
+      }
+      return describeComponentFrame(name, source, ownerName);
+    default:
+      return "";
   }
 }
 
-// A Fiber is work on a Component that needs to be done or was done. There can
-// be more than one per component.
-
-var debugCounter = void 0;
-
-{
-  debugCounter = 1;
+// This function can only be called with a work-in-progress fiber and
+// only during begin or complete phase. Do not call it under any other
+// circumstances.
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  var node = workInProgress;
+  do {
+    info += describeFiber(node);
+    // Otherwise this return pointer might point to the wrong tree:
+    node = node["return"];
+  } while (node);
+  return info;
 }
 
-function FiberNode(tag, pendingProps, key, mode) {
-  // Instance
-  this.tag = tag;
-  this.key = key;
-  this.type = null;
-  this.stateNode = null;
-
-  // Fiber
-  this["return"] = null;
-  this.child = null;
-  this.sibling = null;
-  this.index = 0;
-
-  this.ref = null;
-
-  this.pendingProps = pendingProps;
-  this.memoizedProps = null;
-  this.updateQueue = null;
-  this.memoizedState = null;
-
-  this.mode = mode;
-
-  // Effects
-  this.effectTag = NoEffect;
-  this.nextEffect = null;
-
-  this.firstEffect = null;
-  this.lastEffect = null;
+/**
+ * Forked from fbjs/warning:
+ * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+ *
+ * Only change is we use console.warn instead of console.error,
+ * and do nothing when 'console' is not supported.
+ * This really simplifies the code.
+ * ---
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
 
-  this.expirationTime = NoWork;
+var lowPriorityWarning = function() {};
 
-  this.alternate = null;
+{
+  var printWarning = function(format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 1 ? _len - 1 : 0),
+        _key = 1;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 1] = arguments[_key];
+    }
 
-  {
-    this._debugID = debugCounter++;
-    this._debugSource = null;
-    this._debugOwner = null;
-    this._debugIsCurrentlyTiming = false;
-    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
-      Object.preventExtensions(this);
+    var argIndex = 0;
+    var message =
+      "Warning: " +
+      format.replace(/%s/g, function() {
+        return args[argIndex++];
+      });
+    if (typeof console !== "undefined") {
+      console.warn(message);
     }
-  }
-}
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      throw new Error(message);
+    } catch (x) {}
+  };
 
-// This is a constructor function, rather than a POJO constructor, still
-// please ensure we do the following:
-// 1) Nobody should add any instance methods on this. Instance methods can be
-//    more difficult to predict when they get optimized and they are almost
-//    never inlined properly in static compilers.
-// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
-//    always know when it is a fiber.
-// 3) We might want to experiment with using numeric keys since they are easier
-//    to optimize in a non-JIT environment.
-// 4) We can easily go from a constructor to a createFiber object literal if that
-//    is faster.
-// 5) It should be easy to port this to a C struct and keep a C implementation
-//    compatible.
-var createFiber = function(tag, pendingProps, key, mode) {
-  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
-  return new FiberNode(tag, pendingProps, key, mode);
-};
+  lowPriorityWarning = function(condition, format) {
+    if (format === undefined) {
+      throw new Error(
+        "`warning(condition, format, ...args)` requires a warning " +
+          "message argument"
+      );
+    }
+    if (!condition) {
+      for (
+        var _len2 = arguments.length,
+          args = Array(_len2 > 2 ? _len2 - 2 : 0),
+          _key2 = 2;
+        _key2 < _len2;
+        _key2++
+      ) {
+        args[_key2 - 2] = arguments[_key2];
+      }
 
-function shouldConstruct(Component) {
-  return !!(Component.prototype && Component.prototype.isReactComponent);
+      printWarning.apply(undefined, [format].concat(args));
+    }
+  };
 }
 
-// This is used to create an alternate fiber to do work on.
-function createWorkInProgress(current, pendingProps, expirationTime) {
-  var workInProgress = current.alternate;
-  if (workInProgress === null) {
-    // We use a double buffering pooling technique because we know that we'll
-    // only ever need at most two versions of a tree. We pool the "other" unused
-    // node that we're free to reuse. This is lazily created to avoid allocating
-    // extra objects for things that are never updated. It also allow us to
-    // reclaim the extra memory if needed.
-    workInProgress = createFiber(
-      current.tag,
-      pendingProps,
-      current.key,
-      current.mode
-    );
-    workInProgress.type = current.type;
-    workInProgress.stateNode = current.stateNode;
-
-    {
-      // DEV-only fields
-      workInProgress._debugID = current._debugID;
-      workInProgress._debugSource = current._debugSource;
-      workInProgress._debugOwner = current._debugOwner;
-    }
+var lowPriorityWarning$1 = lowPriorityWarning;
 
-    workInProgress.alternate = current;
-    current.alternate = workInProgress;
-  } else {
-    workInProgress.pendingProps = pendingProps;
+var ReactStrictModeWarnings = {
+  discardPendingWarnings: function() {},
+  flushPendingDeprecationWarnings: function() {},
+  flushPendingUnsafeLifecycleWarnings: function() {},
+  recordDeprecationWarnings: function(fiber, instance) {},
+  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+};
 
-    // We already have an alternate.
-    // Reset the effect tag.
-    workInProgress.effectTag = NoEffect;
+{
+  var LIFECYCLE_SUGGESTIONS = {
+    UNSAFE_componentWillMount: "componentDidMount",
+    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
+    UNSAFE_componentWillUpdate: "componentDidUpdate"
+  };
 
-    // The effect list is no longer valid.
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
-  }
+  var pendingComponentWillMountWarnings = [];
+  var pendingComponentWillReceivePropsWarnings = [];
+  var pendingComponentWillUpdateWarnings = [];
+  var pendingUnsafeLifecycleWarnings = new Map();
 
-  workInProgress.expirationTime = expirationTime;
+  // Tracks components we have already warned about.
+  var didWarnAboutDeprecatedLifecycles = new Set();
+  var didWarnAboutUnsafeLifecycles = new Set();
 
-  workInProgress.child = current.child;
-  workInProgress.memoizedProps = current.memoizedProps;
-  workInProgress.memoizedState = current.memoizedState;
-  workInProgress.updateQueue = current.updateQueue;
+  ReactStrictModeWarnings.discardPendingWarnings = function() {
+    pendingComponentWillMountWarnings = [];
+    pendingComponentWillReceivePropsWarnings = [];
+    pendingComponentWillUpdateWarnings = [];
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-  // These will be overridden during the parent's reconciliation
-  workInProgress.sibling = current.sibling;
-  workInProgress.index = current.index;
-  workInProgress.ref = current.ref;
+  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
+    pendingUnsafeLifecycleWarnings.forEach(function(
+      lifecycleWarningsMap,
+      strictRoot
+    ) {
+      var lifecyclesWarningMesages = [];
 
-  return workInProgress;
-}
+      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
+        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
+        if (lifecycleWarnings.length > 0) {
+          var componentNames = new Set();
+          lifecycleWarnings.forEach(function(fiber) {
+            componentNames.add(getComponentName(fiber) || "Component");
+            didWarnAboutUnsafeLifecycles.add(fiber.type);
+          });
 
-function createHostRootFiber(isAsync) {
-  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
-  return createFiber(HostRoot, null, null, mode);
-}
+          var formatted = lifecycle.replace("UNSAFE_", "");
+          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
+          var sortedComponentNames = Array.from(componentNames)
+            .sort()
+            .join(", ");
 
-function createFiberFromElement(element, mode, expirationTime) {
-  var owner = null;
-  {
-    owner = element._owner;
-  }
+          lifecyclesWarningMesages.push(
+            formatted +
+              ": Please update the following components to use " +
+              (suggestion + " instead: " + sortedComponentNames)
+          );
+        }
+      });
 
-  var fiber = void 0;
-  var type = element.type;
-  var key = element.key;
-  var pendingProps = element.props;
+      if (lifecyclesWarningMesages.length > 0) {
+        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+          strictRoot
+        );
 
-  var fiberTag = void 0;
-  if (typeof type === "function") {
-    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
-  } else if (typeof type === "string") {
-    fiberTag = HostComponent;
-  } else {
-    switch (type) {
-      case REACT_FRAGMENT_TYPE:
-        return createFiberFromFragment(
-          pendingProps.children,
-          mode,
-          expirationTime,
-          key
+        warning(
+          false,
+          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
+            "\n\n%s" +
+            "\n\nLearn more about this warning here:" +
+            "\nhttps://fb.me/react-strict-mode-warnings",
+          strictRootComponentStack,
+          lifecyclesWarningMesages.join("\n\n")
         );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= AsyncMode | StrictMode;
-        break;
-      case REACT_STRICT_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= StrictMode;
-        break;
-      case REACT_CALL_TYPE:
-        fiberTag = CallComponent;
-        break;
-      case REACT_RETURN_TYPE:
-        fiberTag = ReturnComponent;
-        break;
-      default: {
-        if (typeof type === "object" && type !== null) {
-          switch (type.$$typeof) {
-            case REACT_PROVIDER_TYPE:
-              fiberTag = ContextProvider;
-              break;
-            case REACT_CONTEXT_TYPE:
-              // This is a consumer
-              fiberTag = ContextConsumer;
-              break;
-            default:
-              if (typeof type.tag === "number") {
-                // Currently assumed to be a continuation and therefore is a
-                // fiber already.
-                // TODO: The yield system is currently broken for updates in
-                // some cases. The reified yield stores a fiber, but we don't
-                // know which fiber that is; the current or a workInProgress?
-                // When the continuation gets rendered here we don't know if we
-                // can reuse that fiber or if we need to clone it. There is
-                // probably a clever way to restructure this.
-                fiber = type;
-                fiber.pendingProps = pendingProps;
-                fiber.expirationTime = expirationTime;
-                return fiber;
-              } else {
-                throwOnInvalidElementType(type, owner);
-              }
-              break;
-          }
-        } else {
-          throwOnInvalidElementType(type, owner);
-        }
       }
-    }
-  }
+    });
 
-  fiber = createFiber(fiberTag, pendingProps, key, mode);
-  fiber.type = type;
-  fiber.expirationTime = expirationTime;
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-  {
-    fiber._debugSource = element._source;
-    fiber._debugOwner = element._owner;
-  }
+  var getStrictRoot = function(fiber) {
+    var maybeStrictRoot = null;
 
-  return fiber;
-}
+    while (fiber !== null) {
+      if (fiber.mode & StrictMode) {
+        maybeStrictRoot = fiber;
+      }
 
-function throwOnInvalidElementType(type, owner) {
-  var info = "";
-  {
-    if (
-      type === undefined ||
-      (typeof type === "object" &&
-        type !== null &&
-        Object.keys(type).length === 0)
-    ) {
-      info +=
-        " You likely forgot to export your component from the file " +
-        "it's defined in, or you might have mixed up default and " +
-        "named imports.";
-    }
-    var ownerName = owner ? getComponentName(owner) : null;
-    if (ownerName) {
-      info += "\n\nCheck the render method of `" + ownerName + "`.";
+      fiber = fiber["return"];
     }
-  }
-  invariant(
-    false,
-    "Element type is invalid: expected a string (for built-in " +
-      "components) or a class/function (for composite components) " +
-      "but got: %s.%s",
-    type == null ? type : typeof type,
-    info
-  );
-}
 
-function createFiberFromFragment(elements, mode, expirationTime, key) {
-  var fiber = createFiber(Fragment, elements, key, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
-}
+    return maybeStrictRoot;
+  };
 
-function createFiberFromText(content, mode, expirationTime) {
-  var fiber = createFiber(HostText, content, null, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
-}
+  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
+    if (pendingComponentWillMountWarnings.length > 0) {
+      var uniqueNames = new Set();
+      pendingComponentWillMountWarnings.forEach(function(fiber) {
+        uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-function createFiberFromHostInstanceForDeletion() {
-  var fiber = createFiber(HostComponent, null, null, NoContext);
-  fiber.type = "DELETED";
-  return fiber;
-}
+      var sortedNames = Array.from(uniqueNames)
+        .sort()
+        .join(", ");
 
-function createFiberFromPortal(portal, mode, expirationTime) {
-  var pendingProps = portal.children !== null ? portal.children : [];
-  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
-  fiber.expirationTime = expirationTime;
-  fiber.stateNode = {
-    containerInfo: portal.containerInfo,
-    pendingChildren: null, // Used by persistent updates
-    implementation: portal.implementation
-  };
-  return fiber;
-}
+      lowPriorityWarning$1(
+        false,
+        "componentWillMount is deprecated and will be removed in the next major version. " +
+          "Use componentDidMount instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillMount." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        sortedNames
+      );
 
-// TODO: This should be lifted into the renderer.
+      pendingComponentWillMountWarnings = [];
+    }
 
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  // Cyclic construction. This cheats the type system right now because
-  // stateNode is any.
-  var uninitializedFiber = createHostRootFiber(isAsync);
-  var root = {
-    current: uninitializedFiber,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    remainingExpirationTime: NoWork,
-    isReadyForCommit: false,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
-  uninitializedFiber.stateNode = root;
-  return root;
-}
+    if (pendingComponentWillReceivePropsWarnings.length > 0) {
+      var _uniqueNames = new Set();
+      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
+        _uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
+
+      var _sortedNames = Array.from(_uniqueNames)
+        .sort()
+        .join(", ");
 
-var onCommitFiberRoot = null;
-var onCommitFiberUnmount = null;
-var hasLoggedError = false;
+      lowPriorityWarning$1(
+        false,
+        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
+          "Use static getDerivedStateFromProps instead." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames
+      );
 
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (true && !hasLoggedError) {
-        hasLoggedError = true;
-        warning(false, "React DevTools encountered an error: %s", err);
-      }
+      pendingComponentWillReceivePropsWarnings = [];
     }
-  };
-}
 
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-  if (!hook.supportsFiber) {
-    {
-      warning(
+    if (pendingComponentWillUpdateWarnings.length > 0) {
+      var _uniqueNames2 = new Set();
+      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
+        _uniqueNames2.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
+
+      var _sortedNames2 = Array.from(_uniqueNames2)
+        .sort()
+        .join(", ");
+
+      lowPriorityWarning$1(
         false,
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://fb.me/react-devtools"
+        "componentWillUpdate is deprecated and will be removed in the next major version. " +
+          "Use componentDidUpdate instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillUpdate." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames2
       );
+
+      pendingComponentWillUpdateWarnings = [];
     }
-    // DevTools exists, even though it doesn't support Fiber.
-    return true;
-  }
-  try {
-    var rendererID = hook.inject(internals);
-    // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      warning(false, "React DevTools encountered an error: %s.", err);
+  };
+
+  ReactStrictModeWarnings.recordDeprecationWarnings = function(
+    fiber,
+    instance
+  ) {
+    // Dedup strategy: Warn once per component.
+    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+      return;
     }
-  }
-  // DevTools exists
-  return true;
-}
 
-function onCommitRoot(root) {
-  if (typeof onCommitFiberRoot === "function") {
-    onCommitFiberRoot(root);
-  }
-}
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillMountWarnings.push(fiber);
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" &&
+      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillReceivePropsWarnings.push(fiber);
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" &&
+      instance.componentWillUpdate.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillUpdateWarnings.push(fiber);
+    }
+  };
 
-function onCommitUnmount(fiber) {
-  if (typeof onCommitFiberUnmount === "function") {
-    onCommitFiberUnmount(fiber);
-  }
-}
+  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
+    fiber,
+    instance
+  ) {
+    var strictRoot = getStrictRoot(fiber);
 
-/**
- * Forked from fbjs/warning:
- * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
- *
- * Only change is we use console.warn instead of console.error,
- * and do nothing when 'console' is not supported.
- * This really simplifies the code.
- * ---
- * Similar to invariant but only logs a warning if the condition is not met.
- * This can be used to log issues in development environments in critical
- * paths. Removing the logging code for production environments will keep the
- * same logic and follow the same code paths.
- */
+    // Dedup strategy: Warn once per component.
+    // This is difficult to track any other way since component names
+    // are often vague and are likely to collide between 3rd party libraries.
+    // An expand property is probably okay to use here since it's DEV-only,
+    // and will only be set in the event of serious warnings.
+    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+      return;
+    }
 
-var lowPriorityWarning = function() {};
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    // Note that it is sufficient to check for the presence of a
+    // single lifecycle, componentWillMount, with the polyfill flag.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning === true
+    ) {
+      return;
+    }
 
-{
-  var printWarning = function(format) {
-    for (
-      var _len = arguments.length,
-        args = Array(_len > 1 ? _len - 1 : 0),
-        _key = 1;
-      _key < _len;
-      _key++
+    var warningsForRoot = void 0;
+    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
+      warningsForRoot = {
+        UNSAFE_componentWillMount: [],
+        UNSAFE_componentWillReceiveProps: [],
+        UNSAFE_componentWillUpdate: []
+      };
+
+      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
+    } else {
+      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
+    }
+
+    var unsafeLifecycles = [];
+    if (
+      typeof instance.componentWillMount === "function" ||
+      typeof instance.UNSAFE_componentWillMount === "function"
     ) {
-      args[_key - 1] = arguments[_key];
+      unsafeLifecycles.push("UNSAFE_componentWillMount");
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" ||
+      typeof instance.UNSAFE_componentWillReceiveProps === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" ||
+      typeof instance.UNSAFE_componentWillUpdate === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
     }
 
-    var argIndex = 0;
-    var message =
-      "Warning: " +
-      format.replace(/%s/g, function() {
-        return args[argIndex++];
+    if (unsafeLifecycles.length > 0) {
+      unsafeLifecycles.forEach(function(lifecycle) {
+        warningsForRoot[lifecycle].push(fiber);
       });
-    if (typeof console !== "undefined") {
-      console.warn(message);
     }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) {}
   };
+}
 
-  lowPriorityWarning = function(condition, format) {
-    if (format === undefined) {
-      throw new Error(
-        "`warning(condition, format, ...args)` requires a warning " +
-          "message argument"
-      );
+var debugRenderPhaseSideEffects = false;
+var debugRenderPhaseSideEffectsForStrictMode = false;
+var enableUserTimingAPI = true;
+var enableGetDerivedStateFromCatch = false;
+var warnAboutDeprecatedLifecycles = false;
+var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
+
+// React Fabric uses persistent reconciler.
+var enableMutatingReconciler = false;
+var enableNoopReconciler = false;
+var enablePersistentReconciler = true;
+
+// Only used in www builds.
+
+function getCurrentFiberOwnerName() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
     }
-    if (!condition) {
-      for (
-        var _len2 = arguments.length,
-          args = Array(_len2 > 2 ? _len2 - 2 : 0),
-          _key2 = 2;
-        _key2 < _len2;
-        _key2++
-      ) {
-        args[_key2 - 2] = arguments[_key2];
-      }
+    var owner = fiber._debugOwner;
+    if (owner !== null && typeof owner !== "undefined") {
+      return getComponentName(owner);
+    }
+  }
+  return null;
+}
 
-      printWarning.apply(undefined, [format].concat(args));
+function getCurrentFiberStackAddendum() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
     }
-  };
+    // Safe because if current fiber exists, we are reconciling,
+    // and it is guaranteed to be the work-in-progress version.
+    return getStackAddendumByWorkInProgressFiber(fiber);
+  }
+  return null;
 }
 
-var lowPriorityWarning$1 = lowPriorityWarning;
+function resetCurrentFiber() {
+  ReactDebugCurrentFrame.getCurrentStack = null;
+  ReactDebugCurrentFiber.current = null;
+  ReactDebugCurrentFiber.phase = null;
+}
 
-var ReactStrictModeWarnings = {
-  discardPendingWarnings: function() {},
-  flushPendingDeprecationWarnings: function() {},
-  flushPendingUnsafeLifecycleWarnings: function() {},
-  recordDeprecationWarnings: function(fiber, instance) {},
-  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+function setCurrentFiber(fiber) {
+  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
+  ReactDebugCurrentFiber.current = fiber;
+  ReactDebugCurrentFiber.phase = null;
+}
+
+function setCurrentPhase(phase) {
+  ReactDebugCurrentFiber.phase = phase;
+}
+
+var ReactDebugCurrentFiber = {
+  current: null,
+  phase: null,
+  resetCurrentFiber: resetCurrentFiber,
+  setCurrentFiber: setCurrentFiber,
+  setCurrentPhase: setCurrentPhase,
+  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
+  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
 };
 
-{
-  var LIFECYCLE_SUGGESTIONS = {
-    UNSAFE_componentWillMount: "componentDidMount",
-    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
-    UNSAFE_componentWillUpdate: "componentDidUpdate"
-  };
+// Prefix measurements so that it's possible to filter them.
+// Longer prefixes are hard to read in DevTools.
+var reactEmoji = "\u269B";
+var warningEmoji = "\u26D4";
+var supportsUserTiming =
+  typeof performance !== "undefined" &&
+  typeof performance.mark === "function" &&
+  typeof performance.clearMarks === "function" &&
+  typeof performance.measure === "function" &&
+  typeof performance.clearMeasures === "function";
 
-  var pendingComponentWillMountWarnings = [];
-  var pendingComponentWillReceivePropsWarnings = [];
-  var pendingComponentWillUpdateWarnings = [];
-  var pendingUnsafeLifecycleWarnings = new Map();
+// Keep track of current fiber so that we know the path to unwind on pause.
+// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
+var currentFiber = null;
+// If we're in the middle of user code, which fiber and method is it?
+// Reusing `currentFiber` would be confusing for this because user code fiber
+// can change during commit phase too, but we don't need to unwind it (since
+// lifecycles in the commit phase don't resemble a tree).
+var currentPhase = null;
+var currentPhaseFiber = null;
+// Did lifecycle hook schedule an update? This is often a performance problem,
+// so we will keep track of it, and include it in the report.
+// Track commits caused by cascading updates.
+var isCommitting = false;
+var hasScheduledUpdateInCurrentCommit = false;
+var hasScheduledUpdateInCurrentPhase = false;
+var commitCountInCurrentWorkLoop = 0;
+var effectCountInCurrentCommit = 0;
+var isWaitingForCallback = false;
+// During commits, we only show a measurement once per method name
+// to avoid stretch the commit phase with measurement overhead.
+var labelsInCurrentCommit = new Set();
 
-  // Tracks components we have already warned about.
-  var didWarnAboutDeprecatedLifecycles = new Set();
-  var didWarnAboutUnsafeLifecycles = new Set();
+var formatMarkName = function(markName) {
+  return reactEmoji + " " + markName;
+};
 
-  ReactStrictModeWarnings.discardPendingWarnings = function() {
-    pendingComponentWillMountWarnings = [];
-    pendingComponentWillReceivePropsWarnings = [];
-    pendingComponentWillUpdateWarnings = [];
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+var formatLabel = function(label, warning$$1) {
+  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
+  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
+  return "" + prefix + label + suffix;
+};
 
-  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
-    pendingUnsafeLifecycleWarnings.forEach(function(
-      lifecycleWarningsMap,
-      strictRoot
-    ) {
-      var lifecyclesWarningMesages = [];
+var beginMark = function(markName) {
+  performance.mark(formatMarkName(markName));
+};
 
-      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
-        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
-        if (lifecycleWarnings.length > 0) {
-          var componentNames = new Set();
-          lifecycleWarnings.forEach(function(fiber) {
-            componentNames.add(getComponentName(fiber) || "Component");
-            didWarnAboutUnsafeLifecycles.add(fiber.type);
-          });
+var clearMark = function(markName) {
+  performance.clearMarks(formatMarkName(markName));
+};
 
-          var formatted = lifecycle.replace("UNSAFE_", "");
-          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
-          var sortedComponentNames = Array.from(componentNames)
-            .sort()
-            .join(", ");
+var endMark = function(label, markName, warning$$1) {
+  var formattedMarkName = formatMarkName(markName);
+  var formattedLabel = formatLabel(label, warning$$1);
+  try {
+    performance.measure(formattedLabel, formattedMarkName);
+  } catch (err) {}
+  // If previous mark was missing for some reason, this will throw.
+  // This could only happen if React crashed in an unexpected place earlier.
+  // Don't pile on with more errors.
 
-          lifecyclesWarningMesages.push(
-            formatted +
-              ": Please update the following components to use " +
-              (suggestion + " instead: " + sortedComponentNames)
-          );
-        }
-      });
+  // Clear marks immediately to avoid growing buffer.
+  performance.clearMarks(formattedMarkName);
+  performance.clearMeasures(formattedLabel);
+};
 
-      if (lifecyclesWarningMesages.length > 0) {
-        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-          strictRoot
-        );
+var getFiberMarkName = function(label, debugID) {
+  return label + " (#" + debugID + ")";
+};
 
-        warning(
-          false,
-          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
-            "\n\n%s" +
-            "\n\nLearn more about this warning here:" +
-            "\nhttps://fb.me/react-strict-mode-warnings",
-          strictRootComponentStack,
-          lifecyclesWarningMesages.join("\n\n")
-        );
-      }
-    });
+var getFiberLabel = function(componentName, isMounted, phase) {
+  if (phase === null) {
+    // These are composite component total time measurements.
+    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
+  } else {
+    // Composite component methods.
+    return componentName + "." + phase;
+  }
+};
 
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+var beginFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
 
-  var getStrictRoot = function(fiber) {
-    var maybeStrictRoot = null;
+  if (isCommitting && labelsInCurrentCommit.has(label)) {
+    // During the commit phase, we don't show duplicate labels because
+    // there is a fixed overhead for every measurement, and we don't
+    // want to stretch the commit phase beyond necessary.
+    return false;
+  }
+  labelsInCurrentCommit.add(label);
 
-    while (fiber !== null) {
-      if (fiber.mode & StrictMode) {
-        maybeStrictRoot = fiber;
-      }
+  var markName = getFiberMarkName(label, debugID);
+  beginMark(markName);
+  return true;
+};
 
-      fiber = fiber["return"];
-    }
+var clearFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  clearMark(markName);
+};
 
-    return maybeStrictRoot;
-  };
+var endFiberMark = function(fiber, phase, warning$$1) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  endMark(label, markName, warning$$1);
+};
 
-  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
-    if (pendingComponentWillMountWarnings.length > 0) {
-      var uniqueNames = new Set();
-      pendingComponentWillMountWarnings.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
+var shouldIgnoreFiber = function(fiber) {
+  // Host components should be skipped in the timeline.
+  // We could check typeof fiber.type, but does this work with RN?
+  switch (fiber.tag) {
+    case HostRoot:
+    case HostComponent:
+    case HostText:
+    case HostPortal:
+    case CallComponent:
+    case ReturnComponent:
+    case Fragment:
+    case ContextProvider:
+    case ContextConsumer:
+      return true;
+    default:
+      return false;
+  }
+};
+
+var clearPendingPhaseMeasurement = function() {
+  if (currentPhase !== null && currentPhaseFiber !== null) {
+    clearFiberMark(currentPhaseFiber, currentPhase);
+  }
+  currentPhaseFiber = null;
+  currentPhase = null;
+  hasScheduledUpdateInCurrentPhase = false;
+};
+
+var pauseTimers = function() {
+  // Stops all currently active measurements so that they can be resumed
+  // if we continue in a later deferred loop from the same unit of work.
+  var fiber = currentFiber;
+  while (fiber) {
+    if (fiber._debugIsCurrentlyTiming) {
+      endFiberMark(fiber, null, null);
+    }
+    fiber = fiber["return"];
+  }
+};
 
-      var sortedNames = Array.from(uniqueNames)
-        .sort()
-        .join(", ");
+var resumeTimersRecursively = function(fiber) {
+  if (fiber["return"] !== null) {
+    resumeTimersRecursively(fiber["return"]);
+  }
+  if (fiber._debugIsCurrentlyTiming) {
+    beginFiberMark(fiber, null);
+  }
+};
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillMount is deprecated and will be removed in the next major version. " +
-          "Use componentDidMount instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillMount." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        sortedNames
-      );
+var resumeTimers = function() {
+  // Resumes all measurements that were active during the last deferred loop.
+  if (currentFiber !== null) {
+    resumeTimersRecursively(currentFiber);
+  }
+};
 
-      pendingComponentWillMountWarnings = [];
-    }
+function recordEffect() {
+  if (enableUserTimingAPI) {
+    effectCountInCurrentCommit++;
+  }
+}
 
-    if (pendingComponentWillReceivePropsWarnings.length > 0) {
-      var _uniqueNames = new Set();
-      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
-        _uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
+function recordScheduleUpdate() {
+  if (enableUserTimingAPI) {
+    if (isCommitting) {
+      hasScheduledUpdateInCurrentCommit = true;
+    }
+    if (
+      currentPhase !== null &&
+      currentPhase !== "componentWillMount" &&
+      currentPhase !== "componentWillReceiveProps"
+    ) {
+      hasScheduledUpdateInCurrentPhase = true;
+    }
+  }
+}
 
-      var _sortedNames = Array.from(_uniqueNames)
-        .sort()
-        .join(", ");
+function startRequestCallbackTimer() {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming && !isWaitingForCallback) {
+      isWaitingForCallback = true;
+      beginMark("(Waiting for async callback...)");
+    }
+  }
+}
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
-          "Use static getDerivedStateFromProps instead." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames
+function stopRequestCallbackTimer(didExpire, expirationTime) {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming) {
+      isWaitingForCallback = false;
+      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
+      endMark(
+        "(Waiting for async callback... will force flush in " +
+          expirationTime +
+          " ms)",
+        "(Waiting for async callback...)",
+        warning$$1
       );
+    }
+  }
+}
 
-      pendingComponentWillReceivePropsWarnings = [];
+function startWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
     }
+    // If we pause, this is the fiber to unwind from.
+    currentFiber = fiber;
+    if (!beginFiberMark(fiber, null)) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = true;
+  }
+}
 
-    if (pendingComponentWillUpdateWarnings.length > 0) {
-      var _uniqueNames2 = new Set();
-      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
-        _uniqueNames2.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
+function cancelWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // Remember we shouldn't complete measurement for this fiber.
+    // Otherwise flamechart will be deep even for small updates.
+    fiber._debugIsCurrentlyTiming = false;
+    clearFiberMark(fiber, null);
+  }
+}
 
-      var _sortedNames2 = Array.from(_uniqueNames2)
-        .sort()
-        .join(", ");
+function stopWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = false;
+    endFiberMark(fiber, null, null);
+  }
+}
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillUpdate is deprecated and will be removed in the next major version. " +
-          "Use componentDidUpdate instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillUpdate." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames2
-      );
+function stopFailedWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = false;
+    var warning$$1 = "An error was thrown inside this error boundary";
+    endFiberMark(fiber, null, warning$$1);
+  }
+}
 
-      pendingComponentWillUpdateWarnings = [];
+function startPhaseTimer(fiber, phase) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
+    clearPendingPhaseMeasurement();
+    if (!beginFiberMark(fiber, phase)) {
+      return;
+    }
+    currentPhaseFiber = fiber;
+    currentPhase = phase;
+  }
+}
 
-  ReactStrictModeWarnings.recordDeprecationWarnings = function(
-    fiber,
-    instance
-  ) {
-    // Dedup strategy: Warn once per component.
-    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+function stopPhaseTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    if (currentPhase !== null && currentPhaseFiber !== null) {
+      var warning$$1 = hasScheduledUpdateInCurrentPhase
+        ? "Scheduled a cascading update"
+        : null;
+      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
+    }
+    currentPhase = null;
+    currentPhaseFiber = null;
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
+function startWorkLoopTimer(nextUnitOfWork) {
+  if (enableUserTimingAPI) {
+    currentFiber = nextUnitOfWork;
+    if (!supportsUserTiming) {
       return;
     }
+    commitCountInCurrentWorkLoop = 0;
+    // This is top level call.
+    // Any other measurements are performed within.
+    beginMark("(React Tree Reconciliation)");
+    // Resume any measurements that were in progress during the last loop.
+    resumeTimers();
+  }
+}
 
-    if (typeof instance.componentWillMount === "function") {
-      pendingComponentWillMountWarnings.push(fiber);
+function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (typeof instance.componentWillReceiveProps === "function") {
-      pendingComponentWillReceivePropsWarnings.push(fiber);
+    var warning$$1 = null;
+    if (interruptedBy !== null) {
+      if (interruptedBy.tag === HostRoot) {
+        warning$$1 = "A top-level update interrupted the previous render";
+      } else {
+        var componentName = getComponentName(interruptedBy) || "Unknown";
+        warning$$1 =
+          "An update to " + componentName + " interrupted the previous render";
+      }
+    } else if (commitCountInCurrentWorkLoop > 1) {
+      warning$$1 = "There were cascading updates";
     }
-    if (typeof instance.componentWillUpdate === "function") {
-      pendingComponentWillUpdateWarnings.push(fiber);
+    commitCountInCurrentWorkLoop = 0;
+    var label = didCompleteRoot
+      ? "(React Tree Reconciliation: Completed Root)"
+      : "(React Tree Reconciliation: Yielded)";
+    // Pause any measurements until the next loop.
+    pauseTimers();
+    endMark(label, "(React Tree Reconciliation)", warning$$1);
+  }
+}
+
+function startCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
+    isCommitting = true;
+    hasScheduledUpdateInCurrentCommit = false;
+    labelsInCurrentCommit.clear();
+    beginMark("(Committing Changes)");
+  }
+}
+
+function stopCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+
+    var warning$$1 = null;
+    if (hasScheduledUpdateInCurrentCommit) {
+      warning$$1 = "Lifecycle hook scheduled a cascading update";
+    } else if (commitCountInCurrentWorkLoop > 0) {
+      warning$$1 = "Caused by a cascading update in earlier commit";
+    }
+    hasScheduledUpdateInCurrentCommit = false;
+    commitCountInCurrentWorkLoop++;
+    isCommitting = false;
+    labelsInCurrentCommit.clear();
 
-  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
-    fiber,
-    instance
-  ) {
-    var strictRoot = getStrictRoot(fiber);
+    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
+  }
+}
 
-    // Dedup strategy: Warn once per component.
-    // This is difficult to track any other way since component names
-    // are often vague and are likely to collide between 3rd party libraries.
-    // An expand property is probably okay to use here since it's DEV-only,
-    // and will only be set in the event of serious warnings.
-    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+function startCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Snapshot Effects)");
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
+function stopCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Snapshot Effects: " + count + " Total)",
+      "(Committing Snapshot Effects)",
+      null
+    );
+  }
+}
 
-    var warningsForRoot = void 0;
-    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
-      warningsForRoot = {
-        UNSAFE_componentWillMount: [],
-        UNSAFE_componentWillReceiveProps: [],
-        UNSAFE_componentWillUpdate: []
-      };
-
-      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
-    } else {
-      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
+function startCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Host Effects)");
+  }
+}
 
-    var unsafeLifecycles = [];
-    if (
-      typeof instance.componentWillMount === "function" ||
-      typeof instance.UNSAFE_componentWillMount === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillMount");
-    }
-    if (
-      typeof instance.componentWillReceiveProps === "function" ||
-      typeof instance.UNSAFE_componentWillReceiveProps === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+function stopCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (
-      typeof instance.componentWillUpdate === "function" ||
-      typeof instance.UNSAFE_componentWillUpdate === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Host Effects: " + count + " Total)",
+      "(Committing Host Effects)",
+      null
+    );
+  }
+}
+
+function startCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Calling Lifecycle Methods)");
+  }
+}
 
-    if (unsafeLifecycles.length > 0) {
-      unsafeLifecycles.forEach(function(lifecycle) {
-        warningsForRoot[lifecycle].push(fiber);
-      });
+function stopCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Calling Lifecycle Methods: " + count + " Total)",
+      "(Calling Lifecycle Methods)",
+      null
+    );
+  }
 }
 
 var didWarnUpdateInsideUpdate = void 0;
@@ -6122,7 +5559,8 @@ function createUpdateQueue(baseState) {
     last: null,
     callbackList: null,
     hasForceUpdate: false,
-    isInitialized: false
+    isInitialized: false,
+    capturedValues: null
   };
   {
     queue.isProcessing = false;
@@ -6147,7 +5585,10 @@ function insertUpdateIntoQueue(queue, update) {
   }
 }
 
-function insertUpdateIntoFiber(fiber, update) {
+var q1 = void 0;
+var q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
   // We'll have at least one and at most two distinct update queues.
   var alternateFiber = fiber.alternate;
   var queue1 = fiber.updateQueue;
@@ -6170,6 +5611,16 @@ function insertUpdateIntoFiber(fiber, update) {
   }
   queue2 = queue2 !== queue1 ? queue2 : null;
 
+  // Use module variables instead of returning a tuple
+  q1 = queue1;
+  q2 = queue2;
+}
+
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  var queue1 = q1;
+  var queue2 = q2;
+
   // Warn if an update is scheduled from inside an updater function.
   {
     if (
@@ -6209,14 +5660,17 @@ function insertUpdateIntoFiber(fiber, update) {
 }
 
 function getUpdateExpirationTime(fiber) {
-  if (fiber.tag !== ClassComponent && fiber.tag !== HostRoot) {
-    return NoWork;
-  }
-  var updateQueue = fiber.updateQueue;
-  if (updateQueue === null) {
-    return NoWork;
+  switch (fiber.tag) {
+    case HostRoot:
+    case ClassComponent:
+      var updateQueue = fiber.updateQueue;
+      if (updateQueue === null) {
+        return NoWork;
+      }
+      return updateQueue.expirationTime;
+    default:
+      return NoWork;
   }
-  return updateQueue.expirationTime;
 }
 
 function getStateFromUpdate(update, instance, prevState, props) {
@@ -6245,6 +5699,7 @@ function processUpdateQueue(
       first: currentQueue.first,
       last: currentQueue.last,
       isInitialized: currentQueue.isInitialized,
+      capturedValues: currentQueue.capturedValues,
       // These fields are no longer valid because they were already committed.
       // Reset them.
       callbackList: null,
@@ -6346,12 +5801,24 @@ function processUpdateQueue(
       }
       _callbackList.push(update);
     }
+    if (update.capturedValue !== null) {
+      var _capturedValues = queue.capturedValues;
+      if (_capturedValues === null) {
+        queue.capturedValues = [update.capturedValue];
+      } else {
+        _capturedValues.push(update.capturedValue);
+      }
+    }
     update = update.next;
   }
 
   if (queue.callbackList !== null) {
     workInProgress.effectTag |= Callback;
-  } else if (queue.first === null && !queue.hasForceUpdate) {
+  } else if (
+    queue.first === null &&
+    !queue.hasForceUpdate &&
+    queue.capturedValues === null
+  ) {
     // The queue is empty. We can reset it.
     workInProgress.updateQueue = null;
   }
@@ -6398,23 +5865,26 @@ var isArray = Array.isArray;
 var didWarnAboutStateAssignmentForComponent = void 0;
 var didWarnAboutUndefinedDerivedState = void 0;
 var didWarnAboutUninitializedState = void 0;
-var didWarnAboutWillReceivePropsAndDerivedState = void 0;
+var didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = void 0;
+var didWarnAboutLegacyLifecyclesAndDerivedState = void 0;
 var warnOnInvalidCallback = void 0;
 
 {
-  didWarnAboutStateAssignmentForComponent = {};
-  didWarnAboutUndefinedDerivedState = {};
-  didWarnAboutUninitializedState = {};
-  didWarnAboutWillReceivePropsAndDerivedState = {};
+  didWarnAboutStateAssignmentForComponent = new Set();
+  didWarnAboutUndefinedDerivedState = new Set();
+  didWarnAboutUninitializedState = new Set();
+  didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
+  didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
 
-  var didWarnOnInvalidCallback = {};
+  var didWarnOnInvalidCallback = new Set();
 
   warnOnInvalidCallback = function(callback, callerName) {
     if (callback === null || typeof callback === "function") {
       return;
     }
     var key = callerName + "_" + callback;
-    if (!didWarnOnInvalidCallback[key]) {
+    if (!didWarnOnInvalidCallback.has(key)) {
+      didWarnOnInvalidCallback.add(key);
       warning(
         false,
         "%s(...): Expected the last optional `callback` argument to be a " +
@@ -6422,7 +5892,6 @@ var warnOnInvalidCallback = void 0;
         callerName,
         callback
       );
-      didWarnOnInvalidCallback[key] = true;
     }
   };
 
@@ -6447,14 +5916,34 @@ var warnOnInvalidCallback = void 0;
   });
   Object.freeze(fakeInternalInstance);
 }
+function callGetDerivedStateFromCatch(ctor, capturedValues) {
+  var resultState = {};
+  for (var i = 0; i < capturedValues.length; i++) {
+    var capturedValue = capturedValues[i];
+    var error = capturedValue.value;
+    var partialState = ctor.getDerivedStateFromCatch.call(null, error);
+    if (partialState !== null && partialState !== undefined) {
+      Object.assign(resultState, partialState);
+    }
+  }
+  return resultState;
+}
 
 var ReactFiberClassComponent = function(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
   memoizeState
 ) {
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged;
+
   // Class component state updater
+
   var updater = {
     isMounted: isMounted,
     enqueueSetState: function(instance, partialState, callback) {
@@ -6470,7 +5959,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: false,
         isForced: false,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6489,7 +5978,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: true,
         isForced: false,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6508,7 +5997,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: false,
         isForced: true,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6534,7 +6023,7 @@ var ReactFiberClassComponent = function(
     }
 
     var instance = workInProgress.stateNode;
-    var type = workInProgress.type;
+    var ctor = workInProgress.type;
     if (typeof instance.shouldComponentUpdate === "function") {
       startPhaseTimer(workInProgress, "shouldComponentUpdate");
       var shouldUpdate = instance.shouldComponentUpdate(
@@ -6545,18 +6034,20 @@ var ReactFiberClassComponent = function(
       stopPhaseTimer();
 
       {
-        warning(
-          shouldUpdate !== undefined,
-          "%s.shouldComponentUpdate(): Returned undefined instead of a " +
-            "boolean value. Make sure to return true or false.",
-          getComponentName(workInProgress) || "Unknown"
-        );
+        !(shouldUpdate !== undefined)
+          ? warning(
+              false,
+              "%s.shouldComponentUpdate(): Returned undefined instead of a " +
+                "boolean value. Make sure to return true or false.",
+              getComponentName(workInProgress) || "Component"
+            )
+          : void 0;
       }
 
       return shouldUpdate;
     }
 
-    if (type.prototype && type.prototype.isPureReactComponent) {
+    if (ctor.prototype && ctor.prototype.isPureReactComponent) {
       return (
         !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
       );
@@ -6569,7 +6060,7 @@ var ReactFiberClassComponent = function(
     var instance = workInProgress.stateNode;
     var type = workInProgress.type;
     {
-      var name = getComponentName(workInProgress);
+      var name = getComponentName(workInProgress) || "Component";
       var renderPresent = instance.render;
 
       if (!renderPresent) {
@@ -6594,47 +6085,57 @@ var ReactFiberClassComponent = function(
         !instance.getInitialState ||
         instance.getInitialState.isReactClassApproved ||
         instance.state;
-      warning(
-        noGetInitialStateOnES6,
-        "getInitialState was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Did you mean to define a state property instead?",
-        name
-      );
+      !noGetInitialStateOnES6
+        ? warning(
+            false,
+            "getInitialState was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Did you mean to define a state property instead?",
+            name
+          )
+        : void 0;
       var noGetDefaultPropsOnES6 =
         !instance.getDefaultProps ||
         instance.getDefaultProps.isReactClassApproved;
-      warning(
-        noGetDefaultPropsOnES6,
-        "getDefaultProps was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Use a static property to define defaultProps instead.",
-        name
-      );
+      !noGetDefaultPropsOnES6
+        ? warning(
+            false,
+            "getDefaultProps was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Use a static property to define defaultProps instead.",
+            name
+          )
+        : void 0;
       var noInstancePropTypes = !instance.propTypes;
-      warning(
-        noInstancePropTypes,
-        "propTypes was defined as an instance property on %s. Use a static " +
-          "property to define propTypes instead.",
-        name
-      );
+      !noInstancePropTypes
+        ? warning(
+            false,
+            "propTypes was defined as an instance property on %s. Use a static " +
+              "property to define propTypes instead.",
+            name
+          )
+        : void 0;
       var noInstanceContextTypes = !instance.contextTypes;
-      warning(
-        noInstanceContextTypes,
-        "contextTypes was defined as an instance property on %s. Use a static " +
-          "property to define contextTypes instead.",
-        name
-      );
+      !noInstanceContextTypes
+        ? warning(
+            false,
+            "contextTypes was defined as an instance property on %s. Use a static " +
+              "property to define contextTypes instead.",
+            name
+          )
+        : void 0;
       var noComponentShouldUpdate =
         typeof instance.componentShouldUpdate !== "function";
-      warning(
-        noComponentShouldUpdate,
-        "%s has a method called " +
-          "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
-          "The name is phrased as a question because the function is " +
-          "expected to return a value.",
-        name
-      );
+      !noComponentShouldUpdate
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
+              "The name is phrased as a question because the function is " +
+              "expected to return a value.",
+            name
+          )
+        : void 0;
       if (
         type.prototype &&
         type.prototype.isPureReactComponent &&
@@ -6650,73 +6151,128 @@ var ReactFiberClassComponent = function(
       }
       var noComponentDidUnmount =
         typeof instance.componentDidUnmount !== "function";
-      warning(
-        noComponentDidUnmount,
-        "%s has a method called " +
-          "componentDidUnmount(). But there is no such lifecycle method. " +
-          "Did you mean componentWillUnmount()?",
-        name
-      );
+      !noComponentDidUnmount
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidUnmount(). But there is no such lifecycle method. " +
+              "Did you mean componentWillUnmount()?",
+            name
+          )
+        : void 0;
       var noComponentDidReceiveProps =
         typeof instance.componentDidReceiveProps !== "function";
-      warning(
-        noComponentDidReceiveProps,
-        "%s has a method called " +
-          "componentDidReceiveProps(). But there is no such lifecycle method. " +
-          "If you meant to update the state in response to changing props, " +
-          "use componentWillReceiveProps(). If you meant to fetch data or " +
-          "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
-        name
-      );
+      !noComponentDidReceiveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidReceiveProps(). But there is no such lifecycle method. " +
+              "If you meant to update the state in response to changing props, " +
+              "use componentWillReceiveProps(). If you meant to fetch data or " +
+              "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
+            name
+          )
+        : void 0;
       var noComponentWillRecieveProps =
         typeof instance.componentWillRecieveProps !== "function";
-      warning(
-        noComponentWillRecieveProps,
-        "%s has a method called " +
-          "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
-        name
-      );
+      !noComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var noUnsafeComponentWillRecieveProps =
         typeof instance.UNSAFE_componentWillRecieveProps !== "function";
-      warning(
-        noUnsafeComponentWillRecieveProps,
-        "%s has a method called " +
-          "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
-        name
-      );
+      !noUnsafeComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var hasMutatedProps = instance.props !== workInProgress.pendingProps;
-      warning(
-        instance.props === undefined || !hasMutatedProps,
-        "%s(...): When calling super() in `%s`, make sure to pass " +
-          "up the same props that your component's constructor was passed.",
-        name,
-        name
-      );
+      !(instance.props === undefined || !hasMutatedProps)
+        ? warning(
+            false,
+            "%s(...): When calling super() in `%s`, make sure to pass " +
+              "up the same props that your component's constructor was passed.",
+            name,
+            name
+          )
+        : void 0;
       var noInstanceDefaultProps = !instance.defaultProps;
-      warning(
-        noInstanceDefaultProps,
-        "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
-          " Instead, define defaultProps as a static property on %s.",
-        name,
-        name
-      );
-    }
+      !noInstanceDefaultProps
+        ? warning(
+            false,
+            "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
+              " Instead, define defaultProps as a static property on %s.",
+            name,
+            name
+          )
+        : void 0;
 
-    var state = instance.state;
-    if (state && (typeof state !== "object" || isArray(state))) {
-      warning(
-        false,
-        "%s.state: must be set to an object or null",
-        getComponentName(workInProgress)
-      );
-    }
-    if (typeof instance.getChildContext === "function") {
-      warning(
-        typeof workInProgress.type.childContextTypes === "object",
-        "%s.getChildContext(): childContextTypes must be defined in order to " +
-          "use getChildContext().",
-        getComponentName(workInProgress)
-      );
+      if (
+        typeof instance.getSnapshotBeforeUpdate === "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
+      ) {
+        didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
+        warning(
+          false,
+          "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
+            "This component defines getSnapshotBeforeUpdate() only.",
+          getComponentName(workInProgress)
+        );
+      }
+
+      var noInstanceGetDerivedStateFromProps =
+        typeof instance.getDerivedStateFromProps !== "function";
+      !noInstanceGetDerivedStateFromProps
+        ? warning(
+            false,
+            "%s: getDerivedStateFromProps() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noInstanceGetDerivedStateFromCatch =
+        typeof instance.getDerivedStateFromCatch !== "function";
+      !noInstanceGetDerivedStateFromCatch
+        ? warning(
+            false,
+            "%s: getDerivedStateFromCatch() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noStaticGetSnapshotBeforeUpdate =
+        typeof type.getSnapshotBeforeUpdate !== "function";
+      !noStaticGetSnapshotBeforeUpdate
+        ? warning(
+            false,
+            "%s: getSnapshotBeforeUpdate() is defined as a static method " +
+              "and will be ignored. Instead, declare it as an instance method.",
+            name
+          )
+        : void 0;
+      var _state = instance.state;
+      if (_state && (typeof _state !== "object" || isArray(_state))) {
+        warning(false, "%s.state: must be set to an object or null", name);
+      }
+      if (typeof instance.getChildContext === "function") {
+        !(typeof type.childContextTypes === "object")
+          ? warning(
+              false,
+              "%s.getChildContext(): childContextTypes must be defined in order to " +
+                "use getChildContext().",
+              name
+            )
+          : void 0;
+      }
     }
   }
 
@@ -6764,8 +6320,9 @@ var ReactFiberClassComponent = function(
         typeof ctor.getDerivedStateFromProps === "function" &&
         state === null
       ) {
-        var componentName = getComponentName(workInProgress) || "Unknown";
-        if (!didWarnAboutUninitializedState[componentName]) {
+        var componentName = getComponentName(workInProgress) || "Component";
+        if (!didWarnAboutUninitializedState.has(componentName)) {
+          didWarnAboutUninitializedState.add(componentName);
           warning(
             false,
             "%s: Did not properly initialize state during construction. " +
@@ -6773,7 +6330,75 @@ var ReactFiberClassComponent = function(
             componentName,
             instance.state === null ? "null" : "undefined"
           );
-          didWarnAboutUninitializedState[componentName] = true;
+        }
+      }
+
+      // If new component APIs are defined, "unsafe" lifecycles won't be called.
+      // Warn about these lifecycles if they are present.
+      // Don't warn about react-lifecycles-compat polyfilled methods though.
+      if (
+        typeof ctor.getDerivedStateFromProps === "function" ||
+        typeof instance.getSnapshotBeforeUpdate === "function"
+      ) {
+        var foundWillMountName = null;
+        var foundWillReceivePropsName = null;
+        var foundWillUpdateName = null;
+        if (
+          typeof instance.componentWillMount === "function" &&
+          instance.componentWillMount.__suppressDeprecationWarning !== true
+        ) {
+          foundWillMountName = "componentWillMount";
+        } else if (typeof instance.UNSAFE_componentWillMount === "function") {
+          foundWillMountName = "UNSAFE_componentWillMount";
+        }
+        if (
+          typeof instance.componentWillReceiveProps === "function" &&
+          instance.componentWillReceiveProps.__suppressDeprecationWarning !==
+            true
+        ) {
+          foundWillReceivePropsName = "componentWillReceiveProps";
+        } else if (
+          typeof instance.UNSAFE_componentWillReceiveProps === "function"
+        ) {
+          foundWillReceivePropsName = "UNSAFE_componentWillReceiveProps";
+        }
+        if (
+          typeof instance.componentWillUpdate === "function" &&
+          instance.componentWillUpdate.__suppressDeprecationWarning !== true
+        ) {
+          foundWillUpdateName = "componentWillUpdate";
+        } else if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          foundWillUpdateName = "UNSAFE_componentWillUpdate";
+        }
+        if (
+          foundWillMountName !== null ||
+          foundWillReceivePropsName !== null ||
+          foundWillUpdateName !== null
+        ) {
+          var _componentName = getComponentName(workInProgress) || "Component";
+          var newApiName =
+            typeof ctor.getDerivedStateFromProps === "function"
+              ? "getDerivedStateFromProps()"
+              : "getSnapshotBeforeUpdate()";
+          if (
+            !didWarnAboutLegacyLifecyclesAndDerivedState.has(_componentName)
+          ) {
+            didWarnAboutLegacyLifecyclesAndDerivedState.add(_componentName);
+            warning(
+              false,
+              "Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n" +
+                "%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n" +
+                "The above lifecycles should be removed. Learn more about this warning here:\n" +
+                "https://fb.me/react-async-component-lifecycle-hooks",
+              _componentName,
+              newApiName,
+              foundWillMountName !== null ? "\n  " + foundWillMountName : "",
+              foundWillReceivePropsName !== null
+                ? "\n  " + foundWillReceivePropsName
+                : "",
+              foundWillUpdateName !== null ? "\n  " + foundWillUpdateName : ""
+            );
+          }
         }
       }
     }
@@ -6783,7 +6408,8 @@ var ReactFiberClassComponent = function(
     var partialState = callGetDerivedStateFromProps(
       workInProgress,
       instance,
-      props
+      props,
+      state
     );
 
     if (partialState !== null && partialState !== undefined) {
@@ -6826,7 +6452,7 @@ var ReactFiberClassComponent = function(
           "%s.componentWillMount(): Assigning directly to this.state is " +
             "deprecated (except inside a component's " +
             "constructor). Use setState instead.",
-          getComponentName(workInProgress)
+          getComponentName(workInProgress) || "Component"
         );
       }
       updater.enqueueReplaceState(instance, instance.state, null);
@@ -6852,7 +6478,8 @@ var ReactFiberClassComponent = function(
     if (instance.state !== oldState) {
       {
         var componentName = getComponentName(workInProgress) || "Component";
-        if (!didWarnAboutStateAssignmentForComponent[componentName]) {
+        if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
+          didWarnAboutStateAssignmentForComponent.add(componentName);
           warning(
             false,
             "%s.componentWillReceiveProps(): Assigning directly to " +
@@ -6860,69 +6487,47 @@ var ReactFiberClassComponent = function(
               "constructor). Use setState instead.",
             componentName
           );
-          didWarnAboutStateAssignmentForComponent[componentName] = true;
         }
       }
       updater.enqueueReplaceState(instance, instance.state, null);
-    }
-  }
-
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
-    var type = workInProgress.type;
-
-    if (typeof type.getDerivedStateFromProps === "function") {
-      {
-        // Don't warn about react-lifecycles-compat polyfilled components
-        if (
-          (typeof instance.componentWillReceiveProps === "function" &&
-            instance.componentWillReceiveProps.__suppressDeprecationWarning !==
-              true) ||
-          typeof instance.UNSAFE_componentWillReceiveProps === "function"
-        ) {
-          var componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutWillReceivePropsAndDerivedState[componentName]) {
-            warning(
-              false,
-              "%s: Defines both componentWillReceiveProps() and static " +
-                "getDerivedStateFromProps() methods. We recommend using " +
-                "only getDerivedStateFromProps().",
-              componentName
-            );
-            didWarnAboutWillReceivePropsAndDerivedState[componentName] = true;
-          }
-        }
-      }
+    }
+  }
+
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
+    var type = workInProgress.type;
 
+    if (typeof type.getDerivedStateFromProps === "function") {
       if (
         debugRenderPhaseSideEffects ||
         (debugRenderPhaseSideEffectsForStrictMode &&
           workInProgress.mode & StrictMode)
       ) {
         // Invoke method an extra time to help detect side-effects.
-        type.getDerivedStateFromProps.call(
-          null,
-          props,
-          workInProgress.memoizedState
-        );
+        type.getDerivedStateFromProps.call(null, nextProps, prevState);
       }
 
       var partialState = type.getDerivedStateFromProps.call(
         null,
-        props,
-        workInProgress.memoizedState
+        nextProps,
+        prevState
       );
 
       {
         if (partialState === undefined) {
-          var _componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutUndefinedDerivedState[_componentName]) {
+          var componentName = getComponentName(workInProgress) || "Component";
+          if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
+            didWarnAboutUndefinedDerivedState.add(componentName);
             warning(
               false,
               "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
                 "You have returned undefined.",
-              _componentName
+              componentName
             );
-            didWarnAboutUndefinedDerivedState[_componentName] = _componentName;
           }
         }
       }
@@ -6933,6 +6538,7 @@ var ReactFiberClassComponent = function(
 
   // Invokes the mount life-cycles on a previously never rendered instance.
   function mountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
     var current = workInProgress.alternate;
 
     {
@@ -6965,11 +6571,12 @@ var ReactFiberClassComponent = function(
     }
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      typeof ctor.getDerivedStateFromProps !== "function" &&
+      typeof instance.getSnapshotBeforeUpdate !== "function" &&
       (typeof instance.UNSAFE_componentWillMount === "function" ||
-        typeof instance.componentWillMount === "function") &&
-      typeof workInProgress.type.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillMount === "function")
     ) {
       callComponentWillMount(workInProgress, instance);
       // If we had additional state updates during this life-cycle, let's
@@ -6991,113 +6598,8 @@ var ReactFiberClassComponent = function(
     }
   }
 
-  // Called on a preexisting class instance. Returns false if a resumed render
-  // could be reused.
-  // function resumeMountClassInstance(
-  //   workInProgress: Fiber,
-  //   priorityLevel: PriorityLevel,
-  // ): boolean {
-  //   const instance = workInProgress.stateNode;
-  //   resetInputPointers(workInProgress, instance);
-
-  //   let newState = workInProgress.memoizedState;
-  //   let newProps = workInProgress.pendingProps;
-  //   if (!newProps) {
-  //     // If there isn't any new props, then we'll reuse the memoized props.
-  //     // This could be from already completed work.
-  //     newProps = workInProgress.memoizedProps;
-  //     invariant(
-  //       newProps != null,
-  //       'There should always be pending or memoized props. This error is ' +
-  //         'likely caused by a bug in React. Please file an issue.',
-  //     );
-  //   }
-  //   const newUnmaskedContext = getUnmaskedContext(workInProgress);
-  //   const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
-
-  //   const oldContext = instance.context;
-  //   const oldProps = workInProgress.memoizedProps;
-
-  //   if (
-  //     typeof instance.componentWillReceiveProps === 'function' &&
-  //     (oldProps !== newProps || oldContext !== newContext)
-  //   ) {
-  //     callComponentWillReceiveProps(
-  //       workInProgress,
-  //       instance,
-  //       newProps,
-  //       newContext,
-  //     );
-  //   }
-
-  //   // Process the update queue before calling shouldComponentUpdate
-  //   const updateQueue = workInProgress.updateQueue;
-  //   if (updateQueue !== null) {
-  //     newState = processUpdateQueue(
-  //       workInProgress,
-  //       updateQueue,
-  //       instance,
-  //       newState,
-  //       newProps,
-  //       priorityLevel,
-  //     );
-  //   }
-
-  //   // TODO: Should we deal with a setState that happened after the last
-  //   // componentWillMount and before this componentWillMount? Probably
-  //   // unsupported anyway.
-
-  //   if (
-  //     !checkShouldComponentUpdate(
-  //       workInProgress,
-  //       workInProgress.memoizedProps,
-  //       newProps,
-  //       workInProgress.memoizedState,
-  //       newState,
-  //       newContext,
-  //     )
-  //   ) {
-  //     // Update the existing instance's state, props, and context pointers even
-  //     // though we're bailing out.
-  //     instance.props = newProps;
-  //     instance.state = newState;
-  //     instance.context = newContext;
-  //     return false;
-  //   }
-
-  //   // Update the input pointers now so that they are correct when we call
-  //   // componentWillMount
-  //   instance.props = newProps;
-  //   instance.state = newState;
-  //   instance.context = newContext;
-
-  //   if (typeof instance.componentWillMount === 'function') {
-  //     callComponentWillMount(workInProgress, instance);
-  //     // componentWillMount may have called setState. Process the update queue.
-  //     const newUpdateQueue = workInProgress.updateQueue;
-  //     if (newUpdateQueue !== null) {
-  //       newState = processUpdateQueue(
-  //         workInProgress,
-  //         newUpdateQueue,
-  //         instance,
-  //         newState,
-  //         newProps,
-  //         priorityLevel,
-  //       );
-  //     }
-  //   }
-
-  //   if (typeof instance.componentDidMount === 'function') {
-  //     workInProgress.effectTag |= Update;
-  //   }
-
-  //   instance.state = newState;
-
-  //   return true;
-  // }
-
-  // Invokes the update life-cycles and returns false if it shouldn't rerender.
-  function updateClassInstance(current, workInProgress, renderExpirationTime) {
+  function resumeMountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
     var instance = workInProgress.stateNode;
     resetInputPointers(workInProgress, instance);
 
@@ -7107,16 +6609,20 @@ var ReactFiberClassComponent = function(
     var newUnmaskedContext = getUnmaskedContext(workInProgress);
     var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
     // Note: During these life-cycles, instance.props/instance.state are what
     // ever the previously attempted to render - not the "current". However,
     // during componentDidUpdate we pass the "current" props.
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      !hasNewLifecycles &&
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function") &&
-      typeof workInProgress.type.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillReceiveProps === "function")
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -7128,19 +6634,206 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var partialState = void 0;
+    // Compute the next state using the memoized state and the update queue.
+    var oldState = workInProgress.memoizedState;
+    // TODO: Previous state can be null.
+    var newState = void 0;
+    var derivedStateFromCatch = void 0;
+    if (workInProgress.updateQueue !== null) {
+      newState = processUpdateQueue(
+        null,
+        workInProgress,
+        workInProgress.updateQueue,
+        instance,
+        newProps,
+        renderExpirationTime
+      );
+
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
+      }
+    } else {
+      newState = oldState;
+    }
+
+    var derivedStateFromProps = void 0;
     if (oldProps !== newProps) {
-      partialState = callGetDerivedStateFromProps(
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
         workInProgress,
         instance,
-        newProps
+        newProps,
+        newState
       );
     }
 
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue = workInProgress.updateQueue;
+      if (_updateQueue !== null) {
+        _updateQueue.baseState = Object.assign(
+          {},
+          _updateQueue.baseState,
+          derivedStateFromProps
+        );
+      }
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue2 = workInProgress.updateQueue;
+      if (_updateQueue2 !== null) {
+        _updateQueue2.baseState = Object.assign(
+          {},
+          _updateQueue2.baseState,
+          derivedStateFromCatch
+        );
+      }
+    }
+
+    if (
+      oldProps === newProps &&
+      oldState === newState &&
+      !hasContextChanged() &&
+      !(
+        workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate
+      )
+    ) {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
+      }
+      return false;
+    }
+
+    var shouldUpdate = checkShouldComponentUpdate(
+      workInProgress,
+      oldProps,
+      newProps,
+      oldState,
+      newState,
+      newContext
+    );
+
+    if (shouldUpdate) {
+      // In order to support react-lifecycles-compat polyfilled components,
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
+      if (
+        !hasNewLifecycles &&
+        (typeof instance.UNSAFE_componentWillMount === "function" ||
+          typeof instance.componentWillMount === "function")
+      ) {
+        startPhaseTimer(workInProgress, "componentWillMount");
+        if (typeof instance.componentWillMount === "function") {
+          instance.componentWillMount();
+        }
+        if (typeof instance.UNSAFE_componentWillMount === "function") {
+          instance.UNSAFE_componentWillMount();
+        }
+        stopPhaseTimer();
+      }
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
+      }
+    } else {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
+      }
+
+      // If shouldComponentUpdate returned false, we should still update the
+      // memoized props/state to indicate that this work can be reused.
+      memoizeProps(workInProgress, newProps);
+      memoizeState(workInProgress, newState);
+    }
+
+    // Update the existing instance's state, props, and context pointers even
+    // if shouldComponentUpdate returns false.
+    instance.props = newProps;
+    instance.state = newState;
+    instance.context = newContext;
+
+    return shouldUpdate;
+  }
+
+  // Invokes the update life-cycles and returns false if it shouldn't rerender.
+  function updateClassInstance(current, workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var instance = workInProgress.stateNode;
+    resetInputPointers(workInProgress, instance);
+
+    var oldProps = workInProgress.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+    var oldContext = instance.context;
+    var newUnmaskedContext = getUnmaskedContext(workInProgress);
+    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
+    // Note: During these life-cycles, instance.props/instance.state are what
+    // ever the previously attempted to render - not the "current". However,
+    // during componentDidUpdate we pass the "current" props.
+
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
+    if (
+      !hasNewLifecycles &&
+      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
+        typeof instance.componentWillReceiveProps === "function")
+    ) {
+      if (oldProps !== newProps || oldContext !== newContext) {
+        callComponentWillReceiveProps(
+          workInProgress,
+          instance,
+          newProps,
+          newContext
+        );
+      }
+    }
+
     // Compute the next state using the memoized state and the update queue.
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
     var newState = void 0;
+    var derivedStateFromCatch = void 0;
+
     if (workInProgress.updateQueue !== null) {
       newState = processUpdateQueue(
         current,
@@ -7150,18 +6843,79 @@ var ReactFiberClassComponent = function(
         newProps,
         renderExpirationTime
       );
+
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
+      }
     } else {
       newState = oldState;
     }
 
-    if (partialState !== null && partialState !== undefined) {
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
+    }
+
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue3 = workInProgress.updateQueue;
+      if (_updateQueue3 !== null) {
+        _updateQueue3.baseState = Object.assign(
+          {},
+          _updateQueue3.baseState,
+          derivedStateFromProps
+        );
+      }
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
       // Instead, just synchronously merge the returned state into the instance.
       newState =
         newState === null || newState === undefined
-          ? partialState
-          : Object.assign({}, newState, partialState);
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue4 = workInProgress.updateQueue;
+      if (_updateQueue4 !== null) {
+        _updateQueue4.baseState = Object.assign(
+          {},
+          _updateQueue4.baseState,
+          derivedStateFromCatch
+        );
+      }
     }
 
     if (
@@ -7183,6 +6937,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
       return false;
     }
 
@@ -7197,11 +6959,11 @@ var ReactFiberClassComponent = function(
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
+        !hasNewLifecycles &&
         (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function") &&
-        typeof workInProgress.type.getDerivedStateFromProps !== "function"
+          typeof instance.componentWillUpdate === "function")
       ) {
         startPhaseTimer(workInProgress, "componentWillUpdate");
         if (typeof instance.componentWillUpdate === "function") {
@@ -7215,6 +6977,9 @@ var ReactFiberClassComponent = function(
       if (typeof instance.componentDidUpdate === "function") {
         workInProgress.effectTag |= Update;
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        workInProgress.effectTag |= Snapshot;
+      }
     } else {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
@@ -7226,6 +6991,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
 
       // If shouldComponentUpdate returned false, we should still update the
       // memoized props/state to indicate that this work can be reused.
@@ -7247,7 +7020,7 @@ var ReactFiberClassComponent = function(
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: constructClassInstance,
     mountClassInstance: mountClassInstance,
-    // resumeMountClassInstance,
+    resumeMountClassInstance: resumeMountClassInstance,
     updateClassInstance: updateClassInstance
   };
 };
@@ -8065,13 +7838,15 @@ function ChildReconciler(shouldTrackSideEffects) {
       if (typeof newChildrenIterable.entries === "function") {
         var possibleMap = newChildrenIterable;
         if (possibleMap.entries === iteratorFn) {
-          warning(
-            didWarnAboutMaps,
-            "Using Maps as children is unsupported and will likely yield " +
-              "unexpected results. Convert it to a sequence/iterable of keyed " +
-              "ReactElements instead.%s",
-            getCurrentFiberStackAddendum$1()
-          );
+          !didWarnAboutMaps
+            ? warning(
+                false,
+                "Using Maps as children is unsupported and will likely yield " +
+                  "unexpected results. Convert it to a sequence/iterable of keyed " +
+                  "ReactElements instead.%s",
+                getCurrentFiberStackAddendum$1()
+              )
+            : void 0;
           didWarnAboutMaps = true;
         }
       }
@@ -8513,71 +8288,6 @@ function cloneChildFibers(current, workInProgress) {
   newChild.sibling = null;
 }
 
-var changedBitsStack = [];
-var currentValueStack = [];
-var stack = [];
-var index$1 = -1;
-
-var rendererSigil = void 0;
-{
-  // Use this to detect multiple renderers using the same context
-  rendererSigil = {};
-}
-
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context.changedBits;
-  currentValueStack[index$1] = context.currentValue;
-  stack[index$1] = providerFiber;
-  context.currentValue = providerFiber.pendingProps.value;
-  context.changedBits = providerFiber.stateNode;
-
-  {
-    warning(
-      context._currentRenderer === null ||
-        context._currentRenderer === rendererSigil,
-      "Detected multiple renderers concurrently rendering the " +
-        "same context provider. This is currently unsupported."
-    );
-    context._currentRenderer = rendererSigil;
-  }
-}
-
-function popProvider(providerFiber) {
-  {
-    warning(
-      index$1 > -1 && providerFiber === stack[index$1],
-      "Unexpected pop."
-    );
-  }
-  var changedBits = changedBitsStack[index$1];
-  var currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  index$1 -= 1;
-  var context = providerFiber.type.context;
-  context.currentValue = currentValue;
-  context.changedBits = changedBits;
-}
-
-function resetProviderStack() {
-  for (var i = index$1; i > -1; i--) {
-    var providerFiber = stack[i];
-    var context = providerFiber.type.context;
-    context.currentValue = context.defaultValue;
-    context.changedBits = 0;
-    changedBitsStack[i] = null;
-    currentValueStack[i] = null;
-    stack[i] = null;
-    {
-      context._currentRenderer = null;
-    }
-  }
-  index$1 = -1;
-}
-
 var didWarnAboutBadClass = void 0;
 var didWarnAboutGetDerivedStateOnFunctionalComponent = void 0;
 var didWarnAboutStatelessRefs = void 0;
@@ -8591,6 +8301,8 @@ var didWarnAboutStatelessRefs = void 0;
 var ReactFiberBeginWork = function(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -8599,12 +8311,20 @@ var ReactFiberBeginWork = function(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree;
   var pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer;
+  var pushProvider = newContext.pushProvider;
+  var getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider;
   var enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
 
   var _ReactFiberClassCompo = ReactFiberClassComponent(
+      legacyContext,
       scheduleWork,
       computeExpirationForFiber,
       memoizeProps,
@@ -8615,6 +8335,7 @@ var ReactFiberBeginWork = function(
       _ReactFiberClassCompo.callGetDerivedStateFromProps,
     constructClassInstance = _ReactFiberClassCompo.constructClassInstance,
     mountClassInstance = _ReactFiberClassCompo.mountClassInstance,
+    resumeMountClassInstance = _ReactFiberClassCompo.resumeMountClassInstance,
     updateClassInstance = _ReactFiberClassCompo.updateClassInstance;
 
   // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
@@ -8661,9 +8382,17 @@ var ReactFiberBeginWork = function(
     }
   }
 
+  function updateForwardRef(current, workInProgress) {
+    var render = workInProgress.type.render;
+    var nextChildren = render(workInProgress.pendingProps, workInProgress.ref);
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
+    return workInProgress.child;
+  }
+
   function updateFragment(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -8676,7 +8405,7 @@ var ReactFiberBeginWork = function(
 
   function updateMode(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps.children;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (
@@ -8705,7 +8434,7 @@ var ReactFiberBeginWork = function(
     var fn = workInProgress.type;
     var nextProps = workInProgress.pendingProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else {
@@ -8738,20 +8467,21 @@ var ReactFiberBeginWork = function(
     // Push context providers early to prevent context stack mismatches.
     // During mounting we don't know the child context yet as the instance doesn't exist.
     // We will invalidate the child context in finishClassComponent() right after rendering.
-    var hasContext = pushContextProvider(workInProgress);
-
+    var hasContext = pushLegacyContextProvider(workInProgress);
     var shouldUpdate = void 0;
     if (current === null) {
-      if (!workInProgress.stateNode) {
+      if (workInProgress.stateNode === null) {
         // In the initial pass we might need to construct the instance.
         constructClassInstance(workInProgress, workInProgress.pendingProps);
         mountClassInstance(workInProgress, renderExpirationTime);
 
         shouldUpdate = true;
       } else {
-        invariant(false, "Resuming work not yet implemented.");
         // In a resume, we'll already have an instance we can reuse.
-        // shouldUpdate = resumeMountClassInstance(workInProgress, renderExpirationTime);
+        shouldUpdate = resumeMountClassInstance(
+          workInProgress,
+          renderExpirationTime
+        );
       }
     } else {
       shouldUpdate = updateClassInstance(
@@ -8760,11 +8490,23 @@ var ReactFiberBeginWork = function(
         renderExpirationTime
       );
     }
+
+    // We processed the update queue inside updateClassInstance. It may have
+    // included some errors that were dispatched during the commit phase.
+    // TODO: Refactor class components so this is less awkward.
+    var didCaptureError = false;
+    var updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null && updateQueue.capturedValues !== null) {
+      shouldUpdate = true;
+      didCaptureError = true;
+    }
     return finishClassComponent(
       current,
       workInProgress,
       shouldUpdate,
-      hasContext
+      hasContext,
+      didCaptureError,
+      renderExpirationTime
     );
   }
 
@@ -8772,12 +8514,14 @@ var ReactFiberBeginWork = function(
     current,
     workInProgress,
     shouldUpdate,
-    hasContext
+    hasContext,
+    didCaptureError,
+    renderExpirationTime
   ) {
     // Refs should update even if shouldComponentUpdate returns false
     markRef(current, workInProgress);
 
-    if (!shouldUpdate) {
+    if (!shouldUpdate && !didCaptureError) {
       // Context providers should defer to sCU for rendering
       if (hasContext) {
         invalidateContextProvider(workInProgress, false);
@@ -8786,26 +8530,60 @@ var ReactFiberBeginWork = function(
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
 
+    var ctor = workInProgress.type;
     var instance = workInProgress.stateNode;
 
     // Rerender
     ReactCurrentOwner.current = workInProgress;
     var nextChildren = void 0;
-    {
-      ReactDebugCurrentFiber.setCurrentPhase("render");
-      nextChildren = instance.render();
-      if (
-        debugRenderPhaseSideEffects ||
-        (debugRenderPhaseSideEffectsForStrictMode &&
-          workInProgress.mode & StrictMode)
-      ) {
-        instance.render();
+    if (
+      didCaptureError &&
+      (!enableGetDerivedStateFromCatch ||
+        typeof ctor.getDerivedStateFromCatch !== "function")
+    ) {
+      // If we captured an error, but getDerivedStateFrom catch is not defined,
+      // unmount all the children. componentDidCatch will schedule an update to
+      // re-render a fallback. This is temporary until we migrate everyone to
+      // the new API.
+      // TODO: Warn in a future release.
+      nextChildren = null;
+    } else {
+      {
+        ReactDebugCurrentFiber.setCurrentPhase("render");
+        nextChildren = instance.render();
+        if (
+          debugRenderPhaseSideEffects ||
+          (debugRenderPhaseSideEffectsForStrictMode &&
+            workInProgress.mode & StrictMode)
+        ) {
+          instance.render();
+        }
+        ReactDebugCurrentFiber.setCurrentPhase(null);
       }
-      ReactDebugCurrentFiber.setCurrentPhase(null);
     }
+
     // React DevTools reads this flag.
     workInProgress.effectTag |= PerformedWork;
-    reconcileChildren(current, workInProgress, nextChildren);
+    if (didCaptureError) {
+      // If we're recovering from an error, reconcile twice: first to delete
+      // all the existing children.
+      reconcileChildrenAtExpirationTime(
+        current,
+        workInProgress,
+        null,
+        renderExpirationTime
+      );
+      workInProgress.child = null;
+      // Now we can continue reconciling like normal. This has the effect of
+      // remounting all children regardless of whether their their
+      // identity matches.
+    }
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
     // Memoize props and state using the values we just used to render.
     // TODO: Restructure so we never read values from the instance.
     memoizeState(workInProgress, instance.state);
@@ -8847,13 +8625,21 @@ var ReactFiberBeginWork = function(
         null,
         renderExpirationTime
       );
-      if (prevState === state) {
+      memoizeState(workInProgress, state);
+      updateQueue = workInProgress.updateQueue;
+
+      var element = void 0;
+      if (updateQueue !== null && updateQueue.capturedValues !== null) {
+        // There's an uncaught error. Unmount the whole root.
+        element = null;
+      } else if (prevState === state) {
         // If the state is the same as before, that's a bailout because we had
         // no work that expires at this time.
         resetHydrationState();
         return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      } else {
+        element = state.element;
       }
-      var element = state.element;
       var root = workInProgress.stateNode;
       if (
         (current === null || current.child === null) &&
@@ -8906,11 +8692,22 @@ var ReactFiberBeginWork = function(
     var nextProps = workInProgress.pendingProps;
     var prevProps = current !== null ? current.memoizedProps : null;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (memoizedProps === nextProps) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      var isHidden =
+        workInProgress.mode & AsyncMode &&
+        shouldDeprioritizeSubtree(type, nextProps);
+      if (isHidden) {
+        // Before bailing out, make sure we've deprioritized a hidden component.
+        workInProgress.expirationTime = Never;
+      }
+      if (!isHidden || renderExpirationTime !== Never) {
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      }
+      // If we're rendering a hidden node at hidden priority, don't bailout. The
+      // parent is complete, but the children may not be.
     }
 
     var nextChildren = nextProps.children;
@@ -8939,6 +8736,7 @@ var ReactFiberBeginWork = function(
       // Down-prioritize the children.
       workInProgress.expirationTime = Never;
       // Bailout and come back to this fiber later.
+      workInProgress.memoizedProps = nextProps;
       return null;
     }
 
@@ -9014,7 +8812,8 @@ var ReactFiberBeginWork = function(
         var partialState = callGetDerivedStateFromProps(
           workInProgress,
           value,
-          props
+          props,
+          workInProgress.memoizedState
         );
 
         if (partialState !== null && partialState !== undefined) {
@@ -9029,10 +8828,17 @@ var ReactFiberBeginWork = function(
       // Push context providers early to prevent context stack mismatches.
       // During mounting we don't know the child context yet as the instance doesn't exist.
       // We will invalidate the child context in finishClassComponent() right after rendering.
-      var hasContext = pushContextProvider(workInProgress);
+      var hasContext = pushLegacyContextProvider(workInProgress);
       adoptClassInstance(workInProgress, value);
       mountClassInstance(workInProgress, renderExpirationTime);
-      return finishClassComponent(current, workInProgress, true, hasContext);
+      return finishClassComponent(
+        current,
+        workInProgress,
+        true,
+        hasContext,
+        false,
+        renderExpirationTime
+      );
     } else {
       // Proceed under the assumption that this is a functional component
       workInProgress.tag = FunctionalComponent;
@@ -9040,11 +8846,13 @@ var ReactFiberBeginWork = function(
         var _Component = workInProgress.type;
 
         if (_Component) {
-          warning(
-            !_Component.childContextTypes,
-            "%s(...): childContextTypes cannot be defined on a functional component.",
-            _Component.displayName || _Component.name || "Component"
-          );
+          !!_Component.childContextTypes
+            ? warning(
+                false,
+                "%s(...): childContextTypes cannot be defined on a functional component.",
+                _Component.displayName || _Component.name || "Component"
+              )
+            : void 0;
         }
         if (workInProgress.ref !== null) {
           var info = "";
@@ -9095,7 +8903,7 @@ var ReactFiberBeginWork = function(
 
   function updateCallComponent(current, workInProgress, renderExpirationTime) {
     var nextProps = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextProps) {
@@ -9138,7 +8946,7 @@ var ReactFiberBeginWork = function(
   ) {
     pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -9172,6 +8980,10 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var fiber = workInProgress.child;
+    if (fiber !== null) {
+      // Set the return pointer of the child to the work-in-progress fiber.
+      fiber["return"] = workInProgress;
+    }
     while (fiber !== null) {
       var nextFiber = void 0;
       // Visit this fiber.
@@ -9259,12 +9071,12 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var providerType = workInProgress.type;
-    var context = providerType.context;
+    var context = providerType._context;
 
     var newProps = workInProgress.pendingProps;
     var oldProps = workInProgress.memoizedProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (oldProps === newProps) {
@@ -9272,48 +9084,72 @@ var ReactFiberBeginWork = function(
       pushProvider(workInProgress);
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
-    workInProgress.memoizedProps = newProps;
 
     var newValue = newProps.value;
+    workInProgress.memoizedProps = newProps;
 
     var changedBits = void 0;
     if (oldProps === null) {
       // Initial render
       changedBits = MAX_SIGNED_31_BIT_INT;
     } else {
-      var oldValue = oldProps.value;
-      // Use Object.is to compare the new context value to the old value.
-      // Inlined Object.is polyfill.
-      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-      if (
-        (oldValue === newValue &&
-          (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
-        (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
-      ) {
-        // No change.
+      if (oldProps.value === newProps.value) {
+        // No change. Bailout early if children are the same.
+        if (oldProps.children === newProps.children) {
+          workInProgress.stateNode = 0;
+          pushProvider(workInProgress);
+          return bailoutOnAlreadyFinishedWork(current, workInProgress);
+        }
         changedBits = 0;
       } else {
-        changedBits =
-          typeof context.calculateChangedBits === "function"
-            ? context.calculateChangedBits(oldValue, newValue)
-            : MAX_SIGNED_31_BIT_INT;
-        {
-          warning(
-            (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
-            "calculateChangedBits: Expected the return value to be a " +
-              "31-bit integer. Instead received: %s",
-            changedBits
-          );
-        }
-        changedBits |= 0;
-
-        if (changedBits !== 0) {
-          propagateContextChange(
-            workInProgress,
-            context,
-            changedBits,
-            renderExpirationTime
-          );
+        var oldValue = oldProps.value;
+        // Use Object.is to compare the new context value to the old value.
+        // Inlined Object.is polyfill.
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+        if (
+          (oldValue === newValue &&
+            (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
+          (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
+        ) {
+          // No change. Bailout early if children are the same.
+          if (oldProps.children === newProps.children) {
+            workInProgress.stateNode = 0;
+            pushProvider(workInProgress);
+            return bailoutOnAlreadyFinishedWork(current, workInProgress);
+          }
+          changedBits = 0;
+        } else {
+          changedBits =
+            typeof context._calculateChangedBits === "function"
+              ? context._calculateChangedBits(oldValue, newValue)
+              : MAX_SIGNED_31_BIT_INT;
+          {
+            !((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits)
+              ? warning(
+                  false,
+                  "calculateChangedBits: Expected the return value to be a " +
+                    "31-bit integer. Instead received: %s",
+                  changedBits
+                )
+              : void 0;
+          }
+          changedBits |= 0;
+
+          if (changedBits === 0) {
+            // No change. Bailout early if children are the same.
+            if (oldProps.children === newProps.children) {
+              workInProgress.stateNode = 0;
+              pushProvider(workInProgress);
+              return bailoutOnAlreadyFinishedWork(current, workInProgress);
+            }
+          } else {
+            propagateContextChange(
+              workInProgress,
+              context,
+              changedBits,
+              renderExpirationTime
+            );
+          }
         }
       }
     }
@@ -9321,9 +9157,6 @@ var ReactFiberBeginWork = function(
     workInProgress.stateNode = changedBits;
     pushProvider(workInProgress);
 
-    if (oldProps !== null && oldProps.children === newProps.children) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
     var newChildren = newProps.children;
     reconcileChildren(current, workInProgress, newChildren);
     return workInProgress.child;
@@ -9336,11 +9169,28 @@ var ReactFiberBeginWork = function(
   ) {
     var context = workInProgress.type;
     var newProps = workInProgress.pendingProps;
+    var oldProps = workInProgress.memoizedProps;
+
+    var newValue = context._currentValue;
+    var changedBits = context._changedBits;
+
+    if (hasLegacyContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (changedBits === 0 && oldProps === newProps) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    workInProgress.memoizedProps = newProps;
 
-    var newValue = context.currentValue;
-    var changedBits = context.changedBits;
+    var observedBits = newProps.unstable_observedBits;
+    if (observedBits === undefined || observedBits === null) {
+      // Subscribe to all changes by default
+      observedBits = MAX_SIGNED_31_BIT_INT;
+    }
+    // Store the observedBits on the fiber's stateNode for quick access.
+    workInProgress.stateNode = observedBits;
 
-    if (changedBits !== 0) {
+    if ((changedBits & observedBits) !== 0) {
       // Context change propagation stops at matching consumers, for time-
       // slicing. Continue the propagation here.
       propagateContextChange(
@@ -9350,16 +9200,24 @@ var ReactFiberBeginWork = function(
         renderExpirationTime
       );
     }
+    // There is no bailout on `children` equality because we expect people
+    // to often pass a bound method as a child, but it may reference
+    // `this.state` or `this.props` (and thus needs to re-render on `setState`).
 
-    // Store the observedBits on the fiber's stateNode for quick access.
-    var observedBits = newProps.observedBits;
-    if (observedBits === undefined || observedBits === null) {
-      // Subscribe to all changes by default
-      observedBits = MAX_SIGNED_31_BIT_INT;
+    var render = newProps.children;
+
+    {
+      !(typeof render === "function")
+        ? warning(
+            false,
+            "A context consumer was rendered with multiple children, or a child " +
+              "that isn't a function. A context consumer expects a single child " +
+              "that is a function. If you did pass a function, make sure there " +
+              "is no trailing or leading whitespace around it."
+          )
+        : void 0;
     }
-    workInProgress.stateNode = observedBits;
 
-    var render = newProps.children;
     var newChildren = render(newValue);
     reconcileChildren(current, workInProgress, newChildren);
     return workInProgress.child;
@@ -9415,7 +9273,7 @@ var ReactFiberBeginWork = function(
         pushHostRootContext(workInProgress);
         break;
       case ClassComponent:
-        pushContextProvider(workInProgress);
+        pushLegacyContextProvider(workInProgress);
         break;
       case HostPortal:
         pushHostContainer(
@@ -9496,6 +9354,8 @@ var ReactFiberBeginWork = function(
           workInProgress,
           renderExpirationTime
         );
+      case ForwardRef:
+        return updateForwardRef(current, workInProgress);
       case Fragment:
         return updateFragment(current, workInProgress);
       case Mode:
@@ -9521,74 +9381,18 @@ var ReactFiberBeginWork = function(
     }
   }
 
-  function beginFailedWork(current, workInProgress, renderExpirationTime) {
-    // Push context providers here to avoid a push/pop context mismatch.
-    switch (workInProgress.tag) {
-      case ClassComponent:
-        pushContextProvider(workInProgress);
-        break;
-      case HostRoot:
-        pushHostRootContext(workInProgress);
-        break;
-      default:
-        invariant(
-          false,
-          "Invalid type of work. This error is likely caused by a bug in React. " +
-            "Please file an issue."
-        );
-    }
-
-    // Add an error effect so we can handle the error during the commit phase
-    workInProgress.effectTag |= Err;
-
-    // This is a weird case where we do "resume" work — work that failed on
-    // our first attempt. Because we no longer have a notion of "progressed
-    // deletions," reset the child to the current child to make sure we delete
-    // it again. TODO: Find a better way to handle this, perhaps during a more
-    // general overhaul of error handling.
-    if (current === null) {
-      workInProgress.child = null;
-    } else if (workInProgress.child !== current.child) {
-      workInProgress.child = current.child;
-    }
-
-    if (
-      workInProgress.expirationTime === NoWork ||
-      workInProgress.expirationTime > renderExpirationTime
-    ) {
-      return bailoutOnLowPriority(current, workInProgress);
-    }
-
-    // If we don't bail out, we're going be recomputing our children so we need
-    // to drop our effect list.
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
-
-    // Unmount the current children as if the component rendered null
-    var nextChildren = null;
-    reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      nextChildren,
-      renderExpirationTime
-    );
-
-    if (workInProgress.tag === ClassComponent) {
-      var instance = workInProgress.stateNode;
-      workInProgress.memoizedProps = instance.props;
-      workInProgress.memoizedState = instance.state;
-    }
-
-    return workInProgress.child;
-  }
-
   return {
-    beginWork: beginWork,
-    beginFailedWork: beginFailedWork
+    beginWork: beginWork
   };
 };
 
-var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
+var ReactFiberCompleteWork = function(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   var createInstance = config.createInstance,
     createTextInstance = config.createTextInstance,
     appendInitialChild = config.appendInitialChild,
@@ -9600,6 +9404,9 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
   var prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -9802,14 +9609,12 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
         } else {
           var container = portalOrRoot.containerInfo;
           var newChildSet = createContainerChildSet(container);
-          if (finalizeContainerChildren(container, newChildSet)) {
-            markUpdate(workInProgress);
-          }
-          portalOrRoot.pendingChildren = newChildSet;
           // If children might have changed, we have to add them all to the set.
           appendAllChildrenToContainer(newChildSet, workInProgress);
+          portalOrRoot.pendingChildren = newChildSet;
           // Schedule an update on the container to swap out the container.
           markUpdate(workInProgress);
+          finalizeContainerChildren(container, newChildSet);
         }
       };
       updateHostComponent = function(
@@ -9917,18 +9722,31 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
         return null;
       case ClassComponent: {
         // We are leaving this subtree, so pop context if any.
-        popContextProvider(workInProgress);
+        popLegacyContextProvider(workInProgress);
+
+        // If this component caught an error, schedule an error log effect.
+        var instance = workInProgress.stateNode;
+        var updateQueue = workInProgress.updateQueue;
+        if (updateQueue !== null && updateQueue.capturedValues !== null) {
+          workInProgress.effectTag &= ~DidCapture;
+          if (typeof instance.componentDidCatch === "function") {
+            workInProgress.effectTag |= ErrLog;
+          } else {
+            // Normally we clear this in the commit phase, but since we did not
+            // schedule an effect, we need to reset it here.
+            updateQueue.capturedValues = null;
+          }
+        }
         return null;
       }
       case HostRoot: {
         popHostContainer(workInProgress);
-        popTopLevelContextObject(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
         var fiberRoot = workInProgress.stateNode;
         if (fiberRoot.pendingContext) {
           fiberRoot.context = fiberRoot.pendingContext;
           fiberRoot.pendingContext = null;
         }
-
         if (current === null || current.child === null) {
           // If we hydrated, pop so that we can delete any remaining children
           // that weren't hydrated.
@@ -9938,6 +9756,11 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
           workInProgress.effectTag &= ~Placement;
         }
         updateHostContainer(workInProgress);
+
+        var _updateQueue = workInProgress.updateQueue;
+        if (_updateQueue !== null && _updateQueue.capturedValues !== null) {
+          workInProgress.effectTag |= ErrLog;
+        }
         return null;
       }
       case HostComponent: {
@@ -9952,10 +9775,13 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
           // have newProps so we'll have to reuse them.
           // TODO: Split the update API as separate for the props vs. children.
           // Even better would be if children weren't special cased at all tho.
-          var instance = workInProgress.stateNode;
+          var _instance = workInProgress.stateNode;
           var currentHostContext = getHostContext();
+          // TODO: Experiencing an error where oldProps is null. Suggests a host
+          // component is hitting the resume path. Figure out why. Possibly
+          // related to `hidden`.
           var updatePayload = prepareUpdate(
-            instance,
+            _instance,
             type,
             oldProps,
             newProps,
@@ -10009,7 +9835,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
               markUpdate(workInProgress);
             }
           } else {
-            var _instance = createInstance(
+            var _instance2 = createInstance(
               type,
               newProps,
               rootContainerInstance,
@@ -10017,14 +9843,14 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
               workInProgress
             );
 
-            appendAllChildren(_instance, workInProgress);
+            appendAllChildren(_instance2, workInProgress);
 
             // Certain renderers require commit-time effects for initial mount.
             // (eg DOM renderer supports auto-focus for certain elements).
             // Make sure such renderers get scheduled for later work.
             if (
               finalizeInitialChildren(
-                _instance,
+                _instance2,
                 type,
                 newProps,
                 rootContainerInstance,
@@ -10033,7 +9859,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
             ) {
               markUpdate(workInProgress);
             }
-            workInProgress.stateNode = _instance;
+            workInProgress.stateNode = _instance2;
           }
 
           if (workInProgress.ref !== null) {
@@ -10091,6 +9917,8 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       case ReturnComponent:
         // Does nothing.
         return null;
+      case ForwardRef:
+        return null;
       case Fragment:
         return null;
       case Mode:
@@ -10123,16 +9951,274 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
     }
   }
 
-  return {
-    completeWork: completeWork
-  };
-};
+  return {
+    completeWork: completeWork
+  };
+};
+
+function createCapturedValue(value, source) {
+  // If the value is an error, call this function immediately after it is thrown
+  // so the stack is accurate.
+  return {
+    value: value,
+    source: source,
+    stack: getStackAddendumByWorkInProgressFiber(source)
+  };
+}
+
+var ReactFiberUnwindWork = function(
+  hostContext,
+  legacyContext,
+  newContext,
+  scheduleWork,
+  isAlreadyFailedLegacyErrorBoundary
+) {
+  var popHostContainer = hostContext.popHostContainer,
+    popHostContext = hostContext.popHostContext;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
+
+  function throwException(returnFiber, sourceFiber, rawValue) {
+    // The source fiber did not complete.
+    sourceFiber.effectTag |= Incomplete;
+    // Its effect list is no longer valid.
+    sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+
+    var value = createCapturedValue(rawValue, sourceFiber);
+
+    var workInProgress = returnFiber;
+    do {
+      switch (workInProgress.tag) {
+        case HostRoot: {
+          // Uncaught error
+          var errorInfo = value;
+          ensureUpdateQueues(workInProgress);
+          var updateQueue = workInProgress.updateQueue;
+          updateQueue.capturedValues = [errorInfo];
+          workInProgress.effectTag |= ShouldCapture;
+          return;
+        }
+        case ClassComponent:
+          // Capture and retry
+          var ctor = workInProgress.type;
+          var _instance = workInProgress.stateNode;
+          if (
+            (workInProgress.effectTag & DidCapture) === NoEffect &&
+            ((typeof ctor.getDerivedStateFromCatch === "function" &&
+              enableGetDerivedStateFromCatch) ||
+              (_instance !== null &&
+                typeof _instance.componentDidCatch === "function" &&
+                !isAlreadyFailedLegacyErrorBoundary(_instance)))
+          ) {
+            ensureUpdateQueues(workInProgress);
+            var _updateQueue = workInProgress.updateQueue;
+            var capturedValues = _updateQueue.capturedValues;
+            if (capturedValues === null) {
+              _updateQueue.capturedValues = [value];
+            } else {
+              capturedValues.push(value);
+            }
+            workInProgress.effectTag |= ShouldCapture;
+            return;
+          }
+          break;
+        default:
+          break;
+      }
+      workInProgress = workInProgress["return"];
+    } while (workInProgress !== null);
+  }
+
+  function unwindWork(workInProgress) {
+    switch (workInProgress.tag) {
+      case ClassComponent: {
+        popLegacyContextProvider(workInProgress);
+        var effectTag = workInProgress.effectTag;
+        if (effectTag & ShouldCapture) {
+          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
+      }
+      case HostRoot: {
+        popHostContainer(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
+        var _effectTag = workInProgress.effectTag;
+        if (_effectTag & ShouldCapture) {
+          workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
+      }
+      case HostComponent: {
+        popHostContext(workInProgress);
+        return null;
+      }
+      case HostPortal:
+        popHostContainer(workInProgress);
+        return null;
+      case ContextProvider:
+        popProvider(workInProgress);
+        return null;
+      default:
+        return null;
+    }
+  }
+
+  function unwindInterruptedWork(interruptedWork) {
+    switch (interruptedWork.tag) {
+      case ClassComponent: {
+        popLegacyContextProvider(interruptedWork);
+        break;
+      }
+      case HostRoot: {
+        popHostContainer(interruptedWork);
+        popTopLevelLegacyContextObject(interruptedWork);
+        break;
+      }
+      case HostComponent: {
+        popHostContext(interruptedWork);
+        break;
+      }
+      case HostPortal:
+        popHostContainer(interruptedWork);
+        break;
+      case ContextProvider:
+        popProvider(interruptedWork);
+        break;
+      default:
+        break;
+    }
+  }
+
+  return {
+    throwException: throwException,
+    unwindWork: unwindWork,
+    unwindInterruptedWork: unwindInterruptedWork
+  };
+};
+
+// This module is forked in different environments.
+// By default, return `true` to log errors to the console.
+// Forks can return `false` if this isn't desirable.
+function showErrorDialog(capturedError) {
+  return true;
+}
+
+function logCapturedError(capturedError) {
+  var logError = showErrorDialog(capturedError);
+
+  // Allow injected showErrorDialog() to prevent default console.error logging.
+  // This enables renderers like ReactNative to better manage redbox behavior.
+  if (logError === false) {
+    return;
+  }
+
+  var error = capturedError.error;
+  var suppressLogging = error && error.suppressReactErrorLogging;
+  if (suppressLogging) {
+    return;
+  }
+
+  {
+    var componentName = capturedError.componentName,
+      componentStack = capturedError.componentStack,
+      errorBoundaryName = capturedError.errorBoundaryName,
+      errorBoundaryFound = capturedError.errorBoundaryFound,
+      willRetry = capturedError.willRetry;
+
+    var componentNameMessage = componentName
+      ? "The above error occurred in the <" + componentName + "> component:"
+      : "The above error occurred in one of your React components:";
+
+    var errorBoundaryMessage = void 0;
+    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
+    if (errorBoundaryFound && errorBoundaryName) {
+      if (willRetry) {
+        errorBoundaryMessage =
+          "React will try to recreate this component tree from scratch " +
+          ("using the error boundary you provided, " + errorBoundaryName + ".");
+      } else {
+        errorBoundaryMessage =
+          "This error was initially handled by the error boundary " +
+          errorBoundaryName +
+          ".\n" +
+          "Recreating the tree from scratch failed so React will unmount the tree.";
+      }
+    } else {
+      errorBoundaryMessage =
+        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
+        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
+    }
+    var combinedMessage =
+      "" +
+      componentNameMessage +
+      componentStack +
+      "\n\n" +
+      ("" + errorBoundaryMessage);
+
+    // In development, we provide our own message with just the component stack.
+    // We don't include the original error message and JS stack because the browser
+    // has already printed it. Even if the application swallows the error, it is still
+    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+    console.error(combinedMessage);
+  }
+}
 
 var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
 var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
 
-var ReactFiberCommitWork = function(config, captureError) {
+var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+{
+  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
+}
+
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source;
+  var stack = errorInfo.stack;
+  if (stack === null) {
+    stack = getStackAddendumByWorkInProgressFiber(source);
+  }
+
+  var capturedError = {
+    componentName: source !== null ? getComponentName(source) : null,
+    componentStack: stack !== null ? stack : "",
+    error: errorInfo.value,
+    errorBoundary: null,
+    errorBoundaryName: null,
+    errorBoundaryFound: false,
+    willRetry: false
+  };
+
+  if (boundary !== null && boundary.tag === ClassComponent) {
+    capturedError.errorBoundary = boundary.stateNode;
+    capturedError.errorBoundaryName = getComponentName(boundary);
+    capturedError.errorBoundaryFound = true;
+    capturedError.willRetry = true;
+  }
+
+  try {
+    logCapturedError(capturedError);
+  } catch (e) {
+    // Prevent cycle if logCapturedError() throws.
+    // A cycle may still occur if logCapturedError renders a component that throws.
+    var suppressLogging = e && e.suppressReactErrorLogging;
+    if (!suppressLogging) {
+      console.error(e);
+    }
+  }
+}
+
+var ReactFiberCommitWork = function(
+  config,
+  captureError,
+  scheduleWork,
+  computeExpirationForFiber,
+  markLegacyErrorBoundaryAsFailed,
+  recalculateCurrentTime
+) {
   var getPublicInstance = config.getPublicInstance,
     mutation = config.mutation,
     persistence = config.persistence;
@@ -10174,58 +10260,120 @@ var ReactFiberCommitWork = function(config, captureError) {
           }
         }
       } else {
-        ref.value = null;
+        ref.current = null;
+      }
+    }
+  }
+
+  function commitBeforeMutationLifeCycles(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        if (finishedWork.effectTag & Snapshot) {
+          if (current !== null) {
+            var prevProps = current.memoizedProps;
+            var prevState = current.memoizedState;
+            startPhaseTimer(finishedWork, "getSnapshotBeforeUpdate");
+            var _instance = finishedWork.stateNode;
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            var snapshot = _instance.getSnapshotBeforeUpdate(
+              prevProps,
+              prevState
+            );
+            {
+              var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
+              if (
+                snapshot === undefined &&
+                !didWarnSet.has(finishedWork.type)
+              ) {
+                didWarnSet.add(finishedWork.type);
+                warning(
+                  false,
+                  "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
+                    "must be returned. You have returned undefined.",
+                  getComponentName(finishedWork)
+                );
+              }
+            }
+            _instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+            stopPhaseTimer();
+          }
+        }
+        return;
+      }
+      case HostRoot:
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+        // Nothing to do for these component types
+        return;
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
       }
     }
   }
 
-  function commitLifeCycles(current, finishedWork) {
+  function commitLifeCycles(
+    finishedRoot,
+    current,
+    finishedWork,
+    currentTime,
+    committedExpirationTime
+  ) {
     switch (finishedWork.tag) {
       case ClassComponent: {
-        var instance = finishedWork.stateNode;
+        var _instance2 = finishedWork.stateNode;
         if (finishedWork.effectTag & Update) {
           if (current === null) {
             startPhaseTimer(finishedWork, "componentDidMount");
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidMount();
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidMount();
             stopPhaseTimer();
           } else {
             var prevProps = current.memoizedProps;
             var prevState = current.memoizedState;
             startPhaseTimer(finishedWork, "componentDidUpdate");
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidUpdate(prevProps, prevState);
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidUpdate(
+              prevProps,
+              prevState,
+              _instance2.__reactInternalSnapshotBeforeUpdate
+            );
             stopPhaseTimer();
           }
         }
         var updateQueue = finishedWork.updateQueue;
         if (updateQueue !== null) {
-          commitCallbacks(updateQueue, instance);
+          commitCallbacks(updateQueue, _instance2);
         }
         return;
       }
       case HostRoot: {
         var _updateQueue = finishedWork.updateQueue;
         if (_updateQueue !== null) {
-          var _instance = null;
+          var _instance3 = null;
           if (finishedWork.child !== null) {
             switch (finishedWork.child.tag) {
               case HostComponent:
-                _instance = getPublicInstance(finishedWork.child.stateNode);
+                _instance3 = getPublicInstance(finishedWork.child.stateNode);
                 break;
               case ClassComponent:
-                _instance = finishedWork.child.stateNode;
+                _instance3 = finishedWork.child.stateNode;
                 break;
             }
           }
-          commitCallbacks(_updateQueue, _instance);
+          commitCallbacks(_updateQueue, _instance3);
         }
         return;
       }
       case HostComponent: {
-        var _instance2 = finishedWork.stateNode;
+        var _instance4 = finishedWork.stateNode;
 
         // Renderers may schedule work to be done after host components are mounted
         // (eg DOM renderer may schedule auto-focus for inputs and form controls).
@@ -10234,7 +10382,7 @@ var ReactFiberCommitWork = function(config, captureError) {
         if (current === null && finishedWork.effectTag & Update) {
           var type = finishedWork.type;
           var props = finishedWork.memoizedProps;
-          commitMount(_instance2, type, props, finishedWork);
+          commitMount(_instance4, type, props, finishedWork);
         }
 
         return;
@@ -10257,22 +10405,98 @@ var ReactFiberCommitWork = function(config, captureError) {
     }
   }
 
+  function commitErrorLogging(finishedWork, onUncaughtError) {
+    switch (finishedWork.tag) {
+      case ClassComponent:
+        {
+          var ctor = finishedWork.type;
+          var _instance5 = finishedWork.stateNode;
+          var updateQueue = finishedWork.updateQueue;
+          invariant(
+            updateQueue !== null && updateQueue.capturedValues !== null,
+            "An error logging effect should not have been scheduled if no errors " +
+              "were captured. This error is likely caused by a bug in React. " +
+              "Please file an issue."
+          );
+          var capturedErrors = updateQueue.capturedValues;
+          updateQueue.capturedValues = null;
+
+          if (typeof ctor.getDerivedStateFromCatch !== "function") {
+            // To preserve the preexisting retry behavior of error boundaries,
+            // we keep track of which ones already failed during this batch.
+            // This gets reset before we yield back to the browser.
+            // TODO: Warn in strict mode if getDerivedStateFromCatch is
+            // not defined.
+            markLegacyErrorBoundaryAsFailed(_instance5);
+          }
+
+          _instance5.props = finishedWork.memoizedProps;
+          _instance5.state = finishedWork.memoizedState;
+          for (var i = 0; i < capturedErrors.length; i++) {
+            var errorInfo = capturedErrors[i];
+            var _error = errorInfo.value;
+            var stack = errorInfo.stack;
+            logError(finishedWork, errorInfo);
+            _instance5.componentDidCatch(_error, {
+              componentStack: stack !== null ? stack : ""
+            });
+          }
+        }
+        break;
+      case HostRoot: {
+        var _updateQueue2 = finishedWork.updateQueue;
+        invariant(
+          _updateQueue2 !== null && _updateQueue2.capturedValues !== null,
+          "An error logging effect should not have been scheduled if no errors " +
+            "were captured. This error is likely caused by a bug in React. " +
+            "Please file an issue."
+        );
+        var _capturedErrors = _updateQueue2.capturedValues;
+        _updateQueue2.capturedValues = null;
+        for (var _i = 0; _i < _capturedErrors.length; _i++) {
+          var _errorInfo = _capturedErrors[_i];
+          logError(finishedWork, _errorInfo);
+          onUncaughtError(_errorInfo.value);
+        }
+        break;
+      }
+      default:
+        invariant(
+          false,
+          "This unit of work tag cannot capture errors.  This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+    }
+  }
+
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (ref !== null) {
-      var instance = finishedWork.stateNode;
+      var _instance6 = finishedWork.stateNode;
       var instanceToUse = void 0;
       switch (finishedWork.tag) {
         case HostComponent:
-          instanceToUse = getPublicInstance(instance);
+          instanceToUse = getPublicInstance(_instance6);
           break;
         default:
-          instanceToUse = instance;
+          instanceToUse = _instance6;
       }
       if (typeof ref === "function") {
         ref(instanceToUse);
       } else {
-        ref.value = instanceToUse;
+        {
+          if (!ref.hasOwnProperty("current")) {
+            warning(
+              false,
+              "Unexpected ref object provided for %s. " +
+                "Use either a ref-setter function or React.createRef().%s",
+              getComponentName(finishedWork),
+              getStackAddendumByWorkInProgressFiber(finishedWork)
+            );
+          }
+        }
+
+        ref.current = instanceToUse;
       }
     }
   }
@@ -10283,7 +10507,7 @@ var ReactFiberCommitWork = function(config, captureError) {
       if (typeof currentRef === "function") {
         currentRef(null);
       } else {
-        currentRef.value = null;
+        currentRef.current = null;
       }
     }
   }
@@ -10299,9 +10523,9 @@ var ReactFiberCommitWork = function(config, captureError) {
     switch (current.tag) {
       case ClassComponent: {
         safelyDetachRef(current);
-        var instance = current.stateNode;
-        if (typeof instance.componentWillUnmount === "function") {
-          safelyCallComponentWillUnmount(current, instance);
+        var _instance7 = current.stateNode;
+        if (typeof _instance7.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(current, _instance7);
         }
         return;
       }
@@ -10438,6 +10662,8 @@ var ReactFiberCommitWork = function(config, captureError) {
         },
 
         commitLifeCycles: commitLifeCycles,
+        commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
+        commitErrorLogging: commitErrorLogging,
         commitAttachRef: commitAttachRef,
         commitDetachRef: commitDetachRef
       };
@@ -10695,8 +10921,8 @@ var ReactFiberCommitWork = function(config, captureError) {
         return;
       }
       case HostComponent: {
-        var instance = finishedWork.stateNode;
-        if (instance != null) {
+        var _instance8 = finishedWork.stateNode;
+        if (_instance8 != null) {
           // Commit the work prepared earlier.
           var newProps = finishedWork.memoizedProps;
           // For hydration we reuse the update path but we treat the oldProps
@@ -10709,7 +10935,7 @@ var ReactFiberCommitWork = function(config, captureError) {
           finishedWork.updateQueue = null;
           if (updatePayload !== null) {
             commitUpdate(
-              instance,
+              _instance8,
               updatePayload,
               type,
               oldProps,
@@ -10754,11 +10980,13 @@ var ReactFiberCommitWork = function(config, captureError) {
 
   if (enableMutatingReconciler) {
     return {
+      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
       commitResetTextContent: commitResetTextContent,
       commitPlacement: commitPlacement,
       commitDeletion: commitDeletion,
       commitWork: commitWork,
       commitLifeCycles: commitLifeCycles,
+      commitErrorLogging: commitErrorLogging,
       commitAttachRef: commitAttachRef,
       commitDetachRef: commitDetachRef
     };
@@ -10769,9 +10997,12 @@ var ReactFiberCommitWork = function(config, captureError) {
 
 var NO_CONTEXT = {};
 
-var ReactFiberHostContext = function(config) {
+var ReactFiberHostContext = function(config, stack) {
   var getChildHostContext = config.getChildHostContext,
     getRootHostContext = config.getRootHostContext;
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
 
   var contextStackCursor = createCursor(NO_CONTEXT);
   var contextFiberStackCursor = createCursor(NO_CONTEXT);
@@ -10795,12 +11026,19 @@ var ReactFiberHostContext = function(config) {
     // Push current root instance onto the stack;
     // This allows us to reset root when portals are popped.
     push(rootInstanceStackCursor, nextRootInstance, fiber);
-
-    var nextRootContext = getRootHostContext(nextRootInstance);
-
     // Track the context and the Fiber that provided it.
     // This enables us to pop only Fibers that provide unique contexts.
     push(contextFiberStackCursor, fiber, fiber);
+
+    // Finally, we need to push the host context to the stack.
+    // However, we can't just call getRootHostContext() and push it because
+    // we'd have a different number of entries on the stack depending on
+    // whether getRootHostContext() throws somewhere in renderer code or not.
+    // So we push an empty value first. This lets us safely unwind on errors.
+    push(contextStackCursor, NO_CONTEXT, fiber);
+    var nextRootContext = getRootHostContext(nextRootInstance);
+    // Now that we know this function doesn't throw, replace it.
+    pop(contextStackCursor, fiber);
     push(contextStackCursor, nextRootContext, fiber);
   }
 
@@ -10842,19 +11080,13 @@ var ReactFiberHostContext = function(config) {
     pop(contextFiberStackCursor, fiber);
   }
 
-  function resetHostContainer() {
-    contextStackCursor.current = NO_CONTEXT;
-    rootInstanceStackCursor.current = NO_CONTEXT;
-  }
-
   return {
     getHostContext: getHostContext,
     getRootHostContainer: getRootHostContainer,
     popHostContainer: popHostContainer,
     popHostContext: popHostContext,
     pushHostContainer: pushHostContainer,
-    pushHostContext: pushHostContext,
-    resetHostContainer: resetHostContainer
+    pushHostContext: pushHostContext
   };
 };
 
@@ -11141,155 +11373,511 @@ var ReactFiberHydrationContext = function(config) {
         }
       }
     }
-    return shouldUpdate;
-  }
+    return shouldUpdate;
+  }
+
+  function popToNextHostParent(fiber) {
+    var parent = fiber["return"];
+    while (
+      parent !== null &&
+      parent.tag !== HostComponent &&
+      parent.tag !== HostRoot
+    ) {
+      parent = parent["return"];
+    }
+    hydrationParentFiber = parent;
+  }
+
+  function popHydrationState(fiber) {
+    if (fiber !== hydrationParentFiber) {
+      // We're deeper than the current hydration context, inside an inserted
+      // tree.
+      return false;
+    }
+    if (!isHydrating) {
+      // If we're not currently hydrating but we're in a hydration context, then
+      // we were an insertion and now need to pop up reenter hydration of our
+      // siblings.
+      popToNextHostParent(fiber);
+      isHydrating = true;
+      return false;
+    }
+
+    var type = fiber.type;
+
+    // If we have any remaining hydratable nodes, we need to delete them now.
+    // We only do this deeper than head and body since they tend to have random
+    // other nodes in them. We also ignore components with pure text content in
+    // side of them.
+    // TODO: Better heuristic.
+    if (
+      fiber.tag !== HostComponent ||
+      (type !== "head" &&
+        type !== "body" &&
+        !shouldSetTextContent(type, fiber.memoizedProps))
+    ) {
+      var nextInstance = nextHydratableInstance;
+      while (nextInstance) {
+        deleteHydratableInstance(fiber, nextInstance);
+        nextInstance = getNextHydratableSibling(nextInstance);
+      }
+    }
+
+    popToNextHostParent(fiber);
+    nextHydratableInstance = hydrationParentFiber
+      ? getNextHydratableSibling(fiber.stateNode)
+      : null;
+    return true;
+  }
+
+  function resetHydrationState() {
+    hydrationParentFiber = null;
+    nextHydratableInstance = null;
+    isHydrating = false;
+  }
+
+  return {
+    enterHydrationState: enterHydrationState,
+    resetHydrationState: resetHydrationState,
+    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
+    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
+    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
+    popHydrationState: popHydrationState
+  };
+};
+
+// This lets us hook into Fiber to debug what it's doing.
+// See https://github.com/facebook/react/pull/8033.
+// This is not part of the public API, not even for React DevTools.
+// You may only inject a debugTool if you work on React Fiber itself.
+var ReactFiberInstrumentation = {
+  debugTool: null
+};
+
+var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
+
+var warnedAboutMissingGetChildContext = void 0;
+
+{
+  warnedAboutMissingGetChildContext = {};
+}
+
+var ReactFiberLegacyContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  // A cursor to the current merged context object on the stack.
+
+  var contextStackCursor = createCursor(emptyObject);
+  // A cursor to a boolean indicating whether the context has changed.
+  var didPerformWorkStackCursor = createCursor(false);
+  // Keep track of the previous context object that was on the stack.
+  // We use this to get access to the parent context after we have already
+  // pushed the next context provider, and now need to merge their contexts.
+  var previousContext = emptyObject;
+
+  function getUnmaskedContext(workInProgress) {
+    var hasOwnContext = isContextProvider(workInProgress);
+    if (hasOwnContext) {
+      // If the fiber is a context provider itself, when we read its context
+      // we have already pushed its own child context on the stack. A context
+      // provider should not "see" its own child context. Therefore we read the
+      // previous (parent) context instead for a context provider.
+      return previousContext;
+    }
+    return contextStackCursor.current;
+  }
+
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    var instance = workInProgress.stateNode;
+    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
+
+  function getMaskedContext(workInProgress, unmaskedContext) {
+    var type = workInProgress.type;
+    var contextTypes = type.contextTypes;
+    if (!contextTypes) {
+      return emptyObject;
+    }
+
+    // Avoid recreating masked context unless unmasked context has changed.
+    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+    // This may trigger infinite loops if componentWillReceiveProps calls setState.
+    var instance = workInProgress.stateNode;
+    if (
+      instance &&
+      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+    ) {
+      return instance.__reactInternalMemoizedMaskedChildContext;
+    }
+
+    var context = {};
+    for (var key in contextTypes) {
+      context[key] = unmaskedContext[key];
+    }
+
+    {
+      var name = getComponentName(workInProgress) || "Unknown";
+      checkPropTypes(
+        contextTypes,
+        context,
+        "context",
+        name,
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // Context is created before the class component is instantiated so check for instance.
+    if (instance) {
+      cacheContext(workInProgress, unmaskedContext, context);
+    }
+
+    return context;
+  }
+
+  function hasContextChanged() {
+    return didPerformWorkStackCursor.current;
+  }
+
+  function isContextConsumer(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
+  }
+
+  function isContextProvider(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+  }
+
+  function popContextProvider(fiber) {
+    if (!isContextProvider(fiber)) {
+      return;
+    }
+
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+
+  function popTopLevelContextObject(fiber) {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+
+  function pushTopLevelContextObject(fiber, context, didChange) {
+    invariant(
+      contextStackCursor.cursor == null,
+      "Unexpected context found on stack. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    push(contextStackCursor, context, fiber);
+    push(didPerformWorkStackCursor, didChange, fiber);
+  }
+
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode;
+    var childContextTypes = fiber.type.childContextTypes;
+
+    // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+    if (typeof instance.getChildContext !== "function") {
+      {
+        var componentName = getComponentName(fiber) || "Unknown";
+
+        if (!warnedAboutMissingGetChildContext[componentName]) {
+          warnedAboutMissingGetChildContext[componentName] = true;
+          warning(
+            false,
+            "%s.childContextTypes is specified but there is no getChildContext() method " +
+              "on the instance. You can either define getChildContext() on %s or remove " +
+              "childContextTypes from it.",
+            componentName,
+            componentName
+          );
+        }
+      }
+      return parentContext;
+    }
 
-  function popToNextHostParent(fiber) {
-    var parent = fiber["return"];
-    while (
-      parent !== null &&
-      parent.tag !== HostComponent &&
-      parent.tag !== HostRoot
-    ) {
-      parent = parent["return"];
+    var childContext = void 0;
+    {
+      ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
     }
-    hydrationParentFiber = parent;
+    startPhaseTimer(fiber, "getChildContext");
+    childContext = instance.getChildContext();
+    stopPhaseTimer();
+    {
+      ReactDebugCurrentFiber.setCurrentPhase(null);
+    }
+    for (var contextKey in childContext) {
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    }
+    {
+      var name = getComponentName(fiber) || "Unknown";
+      checkPropTypes(
+        childContextTypes,
+        childContext,
+        "child context",
+        name,
+        // In practice, there is one case in which we won't get a stack. It's when
+        // somebody calls unstable_renderSubtreeIntoContainer() and we process
+        // context from the parent component instance. The stack will be missing
+        // because it's outside of the reconciliation, and so the pointer has not
+        // been set. This is rare and doesn't matter. We'll also remove that API.
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    return Object.assign({}, parentContext, childContext);
   }
 
-  function popHydrationState(fiber) {
-    if (fiber !== hydrationParentFiber) {
-      // We're deeper than the current hydration context, inside an inserted
-      // tree.
+  function pushContextProvider(workInProgress) {
+    if (!isContextProvider(workInProgress)) {
       return false;
     }
-    if (!isHydrating) {
-      // If we're not currently hydrating but we're in a hydration context, then
-      // we were an insertion and now need to pop up reenter hydration of our
-      // siblings.
-      popToNextHostParent(fiber);
-      isHydrating = true;
-      return false;
+
+    var instance = workInProgress.stateNode;
+    // We push the context as early as possible to ensure stack integrity.
+    // If the instance does not exist yet, we will push null at first,
+    // and replace it on the stack later when invalidating the context.
+    var memoizedMergedChildContext =
+      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+      emptyObject;
+
+    // Remember the parent context so we can merge with it later.
+    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+    previousContext = contextStackCursor.current;
+    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+    push(
+      didPerformWorkStackCursor,
+      didPerformWorkStackCursor.current,
+      workInProgress
+    );
+
+    return true;
+  }
+
+  function invalidateContextProvider(workInProgress, didChange) {
+    var instance = workInProgress.stateNode;
+    invariant(
+      instance,
+      "Expected to have an instance by this point. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    if (didChange) {
+      // Merge parent and own context.
+      // Skip this if we're not updating due to sCU.
+      // This avoids unnecessarily recomputing memoized values.
+      var mergedContext = processChildContext(workInProgress, previousContext);
+      instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+
+      // Replace the old (or empty) context with the new one.
+      // It is important to unwind the context in the reverse order.
+      pop(didPerformWorkStackCursor, workInProgress);
+      pop(contextStackCursor, workInProgress);
+      // Now push the new context and mark that it has changed.
+      push(contextStackCursor, mergedContext, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    } else {
+      pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
     }
+  }
 
-    var type = fiber.type;
+  function findCurrentUnmaskedContext(fiber) {
+    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+    // makes sense elsewhere
+    invariant(
+      isFiberMounted(fiber) && fiber.tag === ClassComponent,
+      "Expected subtree parent to be a mounted class component. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
 
-    // If we have any remaining hydratable nodes, we need to delete them now.
-    // We only do this deeper than head and body since they tend to have random
-    // other nodes in them. We also ignore components with pure text content in
-    // side of them.
-    // TODO: Better heuristic.
-    if (
-      fiber.tag !== HostComponent ||
-      (type !== "head" &&
-        type !== "body" &&
-        !shouldSetTextContent(type, fiber.memoizedProps))
-    ) {
-      var nextInstance = nextHydratableInstance;
-      while (nextInstance) {
-        deleteHydratableInstance(fiber, nextInstance);
-        nextInstance = getNextHydratableSibling(nextInstance);
+    var node = fiber;
+    while (node.tag !== HostRoot) {
+      if (isContextProvider(node)) {
+        return node.stateNode.__reactInternalMemoizedMergedChildContext;
       }
+      var parent = node["return"];
+      invariant(
+        parent,
+        "Found unexpected detached subtree parent. " +
+          "This error is likely caused by a bug in React. Please file an issue."
+      );
+      node = parent;
     }
+    return node.stateNode.context;
+  }
 
-    popToNextHostParent(fiber);
-    nextHydratableInstance = hydrationParentFiber
-      ? getNextHydratableSibling(fiber.stateNode)
-      : null;
-    return true;
+  return {
+    getUnmaskedContext: getUnmaskedContext,
+    cacheContext: cacheContext,
+    getMaskedContext: getMaskedContext,
+    hasContextChanged: hasContextChanged,
+    isContextConsumer: isContextConsumer,
+    isContextProvider: isContextProvider,
+    popContextProvider: popContextProvider,
+    popTopLevelContextObject: popTopLevelContextObject,
+    pushTopLevelContextObject: pushTopLevelContextObject,
+    processChildContext: processChildContext,
+    pushContextProvider: pushContextProvider,
+    invalidateContextProvider: invalidateContextProvider,
+    findCurrentUnmaskedContext: findCurrentUnmaskedContext
+  };
+};
+
+var ReactFiberNewContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  var providerCursor = createCursor(null);
+  var valueCursor = createCursor(null);
+  var changedBitsCursor = createCursor(0);
+
+  var rendererSigil = void 0;
+  {
+    // Use this to detect multiple renderers using the same context
+    rendererSigil = {};
   }
 
-  function resetHydrationState() {
-    hydrationParentFiber = null;
-    nextHydratableInstance = null;
-    isHydrating = false;
+  function pushProvider(providerFiber) {
+    var context = providerFiber.type._context;
+
+    push(changedBitsCursor, context._changedBits, providerFiber);
+    push(valueCursor, context._currentValue, providerFiber);
+    push(providerCursor, providerFiber, providerFiber);
+
+    context._currentValue = providerFiber.pendingProps.value;
+    context._changedBits = providerFiber.stateNode;
+
+    {
+      !(
+        context._currentRenderer === null ||
+        context._currentRenderer === rendererSigil
+      )
+        ? warning(
+            false,
+            "Detected multiple renderers concurrently rendering the " +
+              "same context provider. This is currently unsupported."
+          )
+        : void 0;
+      context._currentRenderer = rendererSigil;
+    }
+  }
+
+  function popProvider(providerFiber) {
+    var changedBits = changedBitsCursor.current;
+    var currentValue = valueCursor.current;
+
+    pop(providerCursor, providerFiber);
+    pop(valueCursor, providerFiber);
+    pop(changedBitsCursor, providerFiber);
+
+    var context = providerFiber.type._context;
+    context._currentValue = currentValue;
+    context._changedBits = changedBits;
   }
 
   return {
-    enterHydrationState: enterHydrationState,
-    resetHydrationState: resetHydrationState,
-    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
-    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
-    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
-    popHydrationState: popHydrationState
+    pushProvider: pushProvider,
+    popProvider: popProvider
   };
 };
 
-// This lets us hook into Fiber to debug what it's doing.
-// See https://github.com/facebook/react/pull/8033.
-// This is not part of the public API, not even for React DevTools.
-// You may only inject a debugTool if you work on React Fiber itself.
-var ReactFiberInstrumentation = {
-  debugTool: null
-};
+var ReactFiberStack = function() {
+  var valueStack = [];
 
-var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
+  var fiberStack = void 0;
 
-// This module is forked in different environments.
-// By default, return `true` to log errors to the console.
-// Forks can return `false` if this isn't desirable.
-function showErrorDialog(capturedError) {
-  return true;
-}
+  {
+    fiberStack = [];
+  }
 
-function logCapturedError(capturedError) {
-  var logError = showErrorDialog(capturedError);
+  var index = -1;
 
-  // Allow injected showErrorDialog() to prevent default console.error logging.
-  // This enables renderers like ReactNative to better manage redbox behavior.
-  if (logError === false) {
-    return;
+  function createCursor(defaultValue) {
+    return {
+      current: defaultValue
+    };
   }
 
-  var error = capturedError.error;
-  var suppressLogging = error && error.suppressReactErrorLogging;
-  if (suppressLogging) {
-    return;
+  function isEmpty() {
+    return index === -1;
   }
 
-  {
-    var componentName = capturedError.componentName,
-      componentStack = capturedError.componentStack,
-      errorBoundaryName = capturedError.errorBoundaryName,
-      errorBoundaryFound = capturedError.errorBoundaryFound,
-      willRetry = capturedError.willRetry;
+  function pop(cursor, fiber) {
+    if (index < 0) {
+      {
+        warning(false, "Unexpected pop.");
+      }
+      return;
+    }
 
-    var componentNameMessage = componentName
-      ? "The above error occurred in the <" + componentName + "> component:"
-      : "The above error occurred in one of your React components:";
+    {
+      if (fiber !== fiberStack[index]) {
+        warning(false, "Unexpected Fiber popped.");
+      }
+    }
 
-    var errorBoundaryMessage = void 0;
-    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
-    if (errorBoundaryFound && errorBoundaryName) {
-      if (willRetry) {
-        errorBoundaryMessage =
-          "React will try to recreate this component tree from scratch " +
-          ("using the error boundary you provided, " + errorBoundaryName + ".");
-      } else {
-        errorBoundaryMessage =
-          "This error was initially handled by the error boundary " +
-          errorBoundaryName +
-          ".\n" +
-          "Recreating the tree from scratch failed so React will unmount the tree.";
+    cursor.current = valueStack[index];
+
+    valueStack[index] = null;
+
+    {
+      fiberStack[index] = null;
+    }
+
+    index--;
+  }
+
+  function push(cursor, value, fiber) {
+    index++;
+
+    valueStack[index] = cursor.current;
+
+    {
+      fiberStack[index] = fiber;
+    }
+
+    cursor.current = value;
+  }
+
+  function checkThatStackIsEmpty() {
+    {
+      if (index !== -1) {
+        warning(
+          false,
+          "Expected an empty stack. Something was not reset properly."
+        );
       }
-    } else {
-      errorBoundaryMessage =
-        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
-        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
     }
-    var combinedMessage =
-      "" +
-      componentNameMessage +
-      componentStack +
-      "\n\n" +
-      ("" + errorBoundaryMessage);
+  }
 
-    // In development, we provide our own message with just the component stack.
-    // We don't include the original error message and JS stack because the browser
-    // has already printed it. Even if the application swallows the error, it is still
-    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
-    console.error(combinedMessage);
+  function resetStackAfterFatalErrorInDev() {
+    {
+      index = -1;
+      valueStack.length = 0;
+      fiberStack.length = 0;
+    }
   }
-}
+
+  return {
+    createCursor: createCursor,
+    isEmpty: isEmpty,
+    pop: pop,
+    push: push,
+    checkThatStackIsEmpty: checkThatStackIsEmpty,
+    resetStackAfterFatalErrorInDev: resetStackAfterFatalErrorInDev
+  };
+};
 
 var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError = ReactErrorUtils.hasCaughtError;
@@ -11306,17 +11894,19 @@ var warnAboutInvalidUpdates = void 0;
   var didWarnStateUpdateForUnmountedComponent = {};
 
   warnAboutUpdateOnUnmounted = function(fiber) {
+    // We show the whole stack but dedupe on the top component's name because
+    // the problematic code almost always lies inside that component.
     var componentName = getComponentName(fiber) || "ReactClass";
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
     warning(
       false,
-      "Can only update a mounted or mounting " +
-        "component. This usually means you called setState, replaceState, " +
-        "or forceUpdate on an unmounted component. This is a no-op.\n\nPlease " +
-        "check the code for the %s component.",
-      componentName
+      "Can't call setState (or forceUpdate) on an unmounted component. This " +
+        "is a no-op, but it indicates a memory leak in your application. To " +
+        "fix, cancel all subscriptions and asynchronous tasks in the " +
+        "componentWillUnmount method.%s",
+      getStackAddendumByWorkInProgressFiber(fiber)
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
@@ -11351,35 +11941,65 @@ var warnAboutInvalidUpdates = void 0;
 }
 
 var ReactFiberScheduler = function(config) {
-  var hostContext = ReactFiberHostContext(config);
+  var stack = ReactFiberStack();
+  var hostContext = ReactFiberHostContext(config, stack);
+  var legacyContext = ReactFiberLegacyContext(stack);
+  var newContext = ReactFiberNewContext(stack);
+  var popHostContext = hostContext.popHostContext,
+    popHostContainer = hostContext.popHostContainer;
+  var popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popLegacyContextProvider = legacyContext.popContextProvider;
+  var popProvider = newContext.popProvider;
+
   var hydrationContext = ReactFiberHydrationContext(config);
-  var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext,
-    resetHostContainer = hostContext.resetHostContainer;
 
   var _ReactFiberBeginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
     ),
-    beginWork = _ReactFiberBeginWork.beginWork,
-    beginFailedWork = _ReactFiberBeginWork.beginFailedWork;
+    beginWork = _ReactFiberBeginWork.beginWork;
 
   var _ReactFiberCompleteWo = ReactFiberCompleteWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext
     ),
     completeWork = _ReactFiberCompleteWo.completeWork;
 
-  var _ReactFiberCommitWork = ReactFiberCommitWork(config, captureError),
+  var _ReactFiberUnwindWork = ReactFiberUnwindWork(
+      hostContext,
+      legacyContext,
+      newContext,
+      scheduleWork,
+      isAlreadyFailedLegacyErrorBoundary
+    ),
+    throwException = _ReactFiberUnwindWork.throwException,
+    unwindWork = _ReactFiberUnwindWork.unwindWork,
+    unwindInterruptedWork = _ReactFiberUnwindWork.unwindInterruptedWork;
+
+  var _ReactFiberCommitWork = ReactFiberCommitWork(
+      config,
+      onCommitPhaseError,
+      scheduleWork,
+      computeExpirationForFiber,
+      markLegacyErrorBoundaryAsFailed,
+      recalculateCurrentTime
+    ),
+    commitBeforeMutationLifeCycles =
+      _ReactFiberCommitWork.commitBeforeMutationLifeCycles,
     commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
     commitPlacement = _ReactFiberCommitWork.commitPlacement,
     commitDeletion = _ReactFiberCommitWork.commitDeletion,
     commitWork = _ReactFiberCommitWork.commitWork,
     commitLifeCycles = _ReactFiberCommitWork.commitLifeCycles,
+    commitErrorLogging = _ReactFiberCommitWork.commitErrorLogging,
     commitAttachRef = _ReactFiberCommitWork.commitAttachRef,
     commitDetachRef = _ReactFiberCommitWork.commitDetachRef;
 
@@ -11391,8 +12011,9 @@ var ReactFiberScheduler = function(config) {
 
   // Represents the current time in ms.
 
-  var startTime = now();
+  var originalStartTimeMs = now();
   var mostRecentCurrentTime = msToExpirationTime(0);
+  var mostRecentCurrentTimeMs = originalStartTimeMs;
 
   // Used to ensure computeUniqueAsyncExpiration is monotonically increases.
   var lastUniqueAsyncExpiration = 0;
@@ -11413,32 +12034,86 @@ var ReactFiberScheduler = function(config) {
   // The next fiber with an effect that we're currently committing.
   var nextEffect = null;
 
-  // Keep track of which fibers have captured an error that need to be handled.
-  // Work is removed from this collection after componentDidCatch is called.
-  var capturedErrors = null;
-  // Keep track of which fibers have failed during the current batch of work.
-  // This is a different set than capturedErrors, because it is not reset until
-  // the end of the batch. This is needed to propagate errors correctly if a
-  // subtree fails more than once.
-  var failedBoundaries = null;
-  // Error boundaries that captured an error during the current commit.
-  var commitPhaseBoundaries = null;
-  var firstUncaughtError = null;
-  var didFatal = false;
+  var isCommitting = false;
+
+  var isRootReadyForCommit = false;
+
+  var legacyErrorBoundariesThatAlreadyFailed = null;
+
+  // Used for performance tracking.
+  var interruptedBy = null;
+
+  var stashedWorkInProgressProperties = void 0;
+  var replayUnitOfWork = void 0;
+  var isReplayingFailedUnitOfWork = void 0;
+  var originalReplayError = void 0;
+  var rethrowOriginalError = void 0;
+  if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+    stashedWorkInProgressProperties = null;
+    isReplayingFailedUnitOfWork = false;
+    originalReplayError = null;
+    replayUnitOfWork = function(failedUnitOfWork, error, isAsync) {
+      // Restore the original state of the work-in-progress
+      assignFiberPropertiesInDEV(
+        failedUnitOfWork,
+        stashedWorkInProgressProperties
+      );
+      switch (failedUnitOfWork.tag) {
+        case HostRoot:
+          popHostContainer(failedUnitOfWork);
+          popTopLevelLegacyContextObject(failedUnitOfWork);
+          break;
+        case HostComponent:
+          popHostContext(failedUnitOfWork);
+          break;
+        case ClassComponent:
+          popLegacyContextProvider(failedUnitOfWork);
+          break;
+        case HostPortal:
+          popHostContainer(failedUnitOfWork);
+          break;
+        case ContextProvider:
+          popProvider(failedUnitOfWork);
+          break;
+      }
+      // Replay the begin phase.
+      isReplayingFailedUnitOfWork = true;
+      originalReplayError = error;
+      invokeGuardedCallback$2(null, workLoop, null, isAsync);
+      isReplayingFailedUnitOfWork = false;
+      originalReplayError = null;
+      if (hasCaughtError()) {
+        clearCaughtError();
+      } else {
+        // If the begin phase did not fail the second time, set this pointer
+        // back to the original value.
+        nextUnitOfWork = failedUnitOfWork;
+      }
+    };
+    rethrowOriginalError = function() {
+      throw originalReplayError;
+    };
+  }
+
+  function resetStack() {
+    if (nextUnitOfWork !== null) {
+      var interruptedWork = nextUnitOfWork["return"];
+      while (interruptedWork !== null) {
+        unwindInterruptedWork(interruptedWork);
+        interruptedWork = interruptedWork["return"];
+      }
+    }
 
-  var isCommitting = false;
-  var isUnmounting = false;
+    {
+      ReactStrictModeWarnings.discardPendingWarnings();
+      stack.checkThatStackIsEmpty();
+    }
 
-  // Used for performance tracking.
-  var interruptedBy = null;
+    nextRoot = null;
+    nextRenderExpirationTime = NoWork;
+    nextUnitOfWork = null;
 
-  function resetContextStack() {
-    // Reset the stack
-    reset();
-    // Reset the cursors
-    resetContext();
-    resetProviderStack();
-    resetHostContainer();
+    isRootReadyForCommit = false;
   }
 
   function commitAllHostEffects() {
@@ -11449,6 +12124,7 @@ var ReactFiberScheduler = function(config) {
       recordEffect();
 
       var effectTag = nextEffect.effectTag;
+
       if (effectTag & ContentReset) {
         commitResetTextContent(nextEffect);
       }
@@ -11464,8 +12140,7 @@ var ReactFiberScheduler = function(config) {
       // updates, and deletions. To avoid needing to add a case for every
       // possible bitmap value, we remove the secondary effects from the
       // effect tag and switch on that value.
-      var primaryEffectTag =
-        effectTag & ~(Callback | Err | ContentReset | Ref | PerformedWork);
+      var primaryEffectTag = effectTag & (Placement | Update | Deletion);
       switch (primaryEffectTag) {
         case Placement: {
           commitPlacement(nextEffect);
@@ -11495,9 +12170,7 @@ var ReactFiberScheduler = function(config) {
           break;
         }
         case Deletion: {
-          isUnmounting = true;
           commitDeletion(nextEffect);
-          isUnmounting = false;
           break;
         }
       }
@@ -11509,7 +12182,27 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function commitAllLifeCycles() {
+  function commitBeforeMutationLifecycles() {
+    while (nextEffect !== null) {
+      var effectTag = nextEffect.effectTag;
+
+      if (effectTag & Snapshot) {
+        recordEffect();
+        var current = nextEffect.alternate;
+        commitBeforeMutationLifeCycles(current, nextEffect);
+      }
+
+      // Don't cleanup effects yet;
+      // This will be done by commitAllLifeCycles()
+      nextEffect = nextEffect.nextEffect;
+    }
+  }
+
+  function commitAllLifeCycles(
+    finishedRoot,
+    currentTime,
+    committedExpirationTime
+  ) {
     {
       ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings();
 
@@ -11517,24 +12210,28 @@ var ReactFiberScheduler = function(config) {
         ReactStrictModeWarnings.flushPendingDeprecationWarnings();
       }
     }
-
     while (nextEffect !== null) {
       var effectTag = nextEffect.effectTag;
 
       if (effectTag & (Update | Callback)) {
         recordEffect();
         var current = nextEffect.alternate;
-        commitLifeCycles(current, nextEffect);
+        commitLifeCycles(
+          finishedRoot,
+          current,
+          nextEffect,
+          currentTime,
+          committedExpirationTime
+        );
       }
 
-      if (effectTag & Ref) {
-        recordEffect();
-        commitAttachRef(nextEffect);
+      if (effectTag & ErrLog) {
+        commitErrorLogging(nextEffect, onUncaughtError);
       }
 
-      if (effectTag & Err) {
+      if (effectTag & Ref) {
         recordEffect();
-        commitErrorHandling(nextEffect);
+        commitAttachRef(nextEffect);
       }
 
       var next = nextEffect.nextEffect;
@@ -11549,11 +12246,22 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
+  function isAlreadyFailedLegacyErrorBoundary(instance) {
+    return (
+      legacyErrorBoundariesThatAlreadyFailed !== null &&
+      legacyErrorBoundariesThatAlreadyFailed.has(instance)
+    );
+  }
+
+  function markLegacyErrorBoundaryAsFailed(instance) {
+    if (legacyErrorBoundariesThatAlreadyFailed === null) {
+      legacyErrorBoundariesThatAlreadyFailed = new Set([instance]);
+    } else {
+      legacyErrorBoundariesThatAlreadyFailed.add(instance);
+    }
+  }
+
   function commitRoot(finishedWork) {
-    // We keep track of this so that captureError can collect any boundaries
-    // that capture an error during the commit phase. The reason these aren't
-    // local to this function is because errors that occur during cWU are
-    // captured elsewhere, to prevent the unmount from being interrupted.
     isWorking = true;
     isCommitting = true;
     startCommitTimer();
@@ -11565,7 +12273,15 @@ var ReactFiberScheduler = function(config) {
         "related to the return field. This error is likely caused by a bug " +
         "in React. Please file an issue."
     );
-    root.isReadyForCommit = false;
+    var committedExpirationTime = root.pendingCommitExpirationTime;
+    invariant(
+      committedExpirationTime !== NoWork,
+      "Cannot commit an incomplete root. This error is likely caused by a " +
+        "bug in React. Please file an issue."
+    );
+    root.pendingCommitExpirationTime = NoWork;
+
+    var currentTime = recalculateCurrentTime();
 
     // Reset this to null before calling lifecycles
     ReactCurrentOwner.current = null;
@@ -11589,28 +12305,56 @@ var ReactFiberScheduler = function(config) {
 
     prepareForCommit(root.containerInfo);
 
+    // Invoke instances of getSnapshotBeforeUpdate before mutation.
+    nextEffect = firstEffect;
+    startCommitSnapshotEffectsTimer();
+    while (nextEffect !== null) {
+      var didError = false;
+      var error = void 0;
+      {
+        invokeGuardedCallback$2(null, commitBeforeMutationLifecycles, null);
+        if (hasCaughtError()) {
+          didError = true;
+          error = clearCaughtError();
+        }
+      }
+      if (didError) {
+        invariant(
+          nextEffect !== null,
+          "Should have next effect. This error is likely caused by a bug " +
+            "in React. Please file an issue."
+        );
+        onCommitPhaseError(nextEffect, error);
+        // Clean-up
+        if (nextEffect !== null) {
+          nextEffect = nextEffect.nextEffect;
+        }
+      }
+    }
+    stopCommitSnapshotEffectsTimer();
+
     // Commit all the side-effects within a tree. We'll do this in two passes.
     // The first pass performs all the host insertions, updates, deletions and
     // ref unmounts.
     nextEffect = firstEffect;
     startCommitHostEffectsTimer();
     while (nextEffect !== null) {
-      var didError = false;
+      var _didError = false;
       var _error = void 0;
       {
         invokeGuardedCallback$2(null, commitAllHostEffects, null);
         if (hasCaughtError()) {
-          didError = true;
+          _didError = true;
           _error = clearCaughtError();
         }
       }
-      if (didError) {
+      if (_didError) {
         invariant(
           nextEffect !== null,
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        captureError(nextEffect, _error);
+        onCommitPhaseError(nextEffect, _error);
         // Clean-up
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
@@ -11634,22 +12378,29 @@ var ReactFiberScheduler = function(config) {
     nextEffect = firstEffect;
     startCommitLifeCyclesTimer();
     while (nextEffect !== null) {
-      var _didError = false;
+      var _didError2 = false;
       var _error2 = void 0;
       {
-        invokeGuardedCallback$2(null, commitAllLifeCycles, null);
+        invokeGuardedCallback$2(
+          null,
+          commitAllLifeCycles,
+          null,
+          root,
+          currentTime,
+          committedExpirationTime
+        );
         if (hasCaughtError()) {
-          _didError = true;
+          _didError2 = true;
           _error2 = clearCaughtError();
         }
       }
-      if (_didError) {
+      if (_didError2) {
         invariant(
           nextEffect !== null,
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        captureError(nextEffect, _error2);
+        onCommitPhaseError(nextEffect, _error2);
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
         }
@@ -11667,26 +12418,12 @@ var ReactFiberScheduler = function(config) {
       ReactFiberInstrumentation_1.debugTool.onCommitWork(finishedWork);
     }
 
-    // If we caught any errors during this commit, schedule their boundaries
-    // to update.
-    if (commitPhaseBoundaries) {
-      commitPhaseBoundaries.forEach(scheduleErrorRecovery);
-      commitPhaseBoundaries = null;
-    }
-
-    if (firstUncaughtError !== null) {
-      var _error3 = firstUncaughtError;
-      firstUncaughtError = null;
-      onUncaughtError(_error3);
-    }
-
     var remainingTime = root.current.expirationTime;
-
     if (remainingTime === NoWork) {
-      capturedErrors = null;
-      failedBoundaries = null;
+      // If there's no remaining work, we can clear the set of already failed
+      // error boundaries.
+      legacyErrorBoundariesThatAlreadyFailed = null;
     }
-
     return remainingTime;
   }
 
@@ -11718,6 +12455,9 @@ var ReactFiberScheduler = function(config) {
   }
 
   function completeUnitOfWork(workInProgress) {
+    // Attempt to complete the current unit of work, then move to the
+    // next sibling. If there are no more siblings, return to the
+    // parent fiber.
     while (true) {
       // The current, flushed, state of this fiber is the alternate.
       // Ideally nothing should rely on this, but relying on it here
@@ -11727,80 +12467,140 @@ var ReactFiberScheduler = function(config) {
       {
         ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
       }
-      var next = completeWork(
-        current,
-        workInProgress,
-        nextRenderExpirationTime
-      );
-      {
-        ReactDebugCurrentFiber.resetCurrentFiber();
-      }
 
       var returnFiber = workInProgress["return"];
       var siblingFiber = workInProgress.sibling;
 
-      resetExpirationTime(workInProgress, nextRenderExpirationTime);
-
-      if (next !== null) {
+      if ((workInProgress.effectTag & Incomplete) === NoEffect) {
+        // This fiber completed.
+        var next = completeWork(
+          current,
+          workInProgress,
+          nextRenderExpirationTime
+        );
         stopWorkTimer(workInProgress);
+        resetExpirationTime(workInProgress, nextRenderExpirationTime);
+        {
+          ReactDebugCurrentFiber.resetCurrentFiber();
+        }
+
+        if (next !== null) {
+          stopWorkTimer(workInProgress);
+          if (true && ReactFiberInstrumentation_1.debugTool) {
+            ReactFiberInstrumentation_1.debugTool.onCompleteWork(
+              workInProgress
+            );
+          }
+          // If completing this work spawned new work, do that next. We'll come
+          // back here again.
+          return next;
+        }
+
+        if (
+          returnFiber !== null &&
+          // Do not append effects to parents if a sibling failed to complete
+          (returnFiber.effectTag & Incomplete) === NoEffect
+        ) {
+          // Append all the effects of the subtree and this fiber onto the effect
+          // list of the parent. The completion order of the children affects the
+          // side-effect order.
+          if (returnFiber.firstEffect === null) {
+            returnFiber.firstEffect = workInProgress.firstEffect;
+          }
+          if (workInProgress.lastEffect !== null) {
+            if (returnFiber.lastEffect !== null) {
+              returnFiber.lastEffect.nextEffect = workInProgress.firstEffect;
+            }
+            returnFiber.lastEffect = workInProgress.lastEffect;
+          }
+
+          // If this fiber had side-effects, we append it AFTER the children's
+          // side-effects. We can perform certain side-effects earlier if
+          // needed, by doing multiple passes over the effect list. We don't want
+          // to schedule our own side-effect on our own list because if end up
+          // reusing children we'll schedule this effect onto itself since we're
+          // at the end.
+          var effectTag = workInProgress.effectTag;
+          // Skip both NoWork and PerformedWork tags when creating the effect list.
+          // PerformedWork effect is read by React DevTools but shouldn't be committed.
+          if (effectTag > PerformedWork) {
+            if (returnFiber.lastEffect !== null) {
+              returnFiber.lastEffect.nextEffect = workInProgress;
+            } else {
+              returnFiber.firstEffect = workInProgress;
+            }
+            returnFiber.lastEffect = workInProgress;
+          }
+        }
+
         if (true && ReactFiberInstrumentation_1.debugTool) {
           ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
         }
-        // If completing this work spawned new work, do that next. We'll come
-        // back here again.
-        return next;
-      }
 
-      if (returnFiber !== null) {
-        // Append all the effects of the subtree and this fiber onto the effect
-        // list of the parent. The completion order of the children affects the
-        // side-effect order.
-        if (returnFiber.firstEffect === null) {
-          returnFiber.firstEffect = workInProgress.firstEffect;
+        if (siblingFiber !== null) {
+          // If there is more work to do in this returnFiber, do that next.
+          return siblingFiber;
+        } else if (returnFiber !== null) {
+          // If there's no more work in this returnFiber. Complete the returnFiber.
+          workInProgress = returnFiber;
+          continue;
+        } else {
+          // We've reached the root.
+          isRootReadyForCommit = true;
+          return null;
         }
-        if (workInProgress.lastEffect !== null) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = workInProgress.firstEffect;
-          }
-          returnFiber.lastEffect = workInProgress.lastEffect;
+      } else {
+        // This fiber did not complete because something threw. Pop values off
+        // the stack without entering the complete phase. If this is a boundary,
+        // capture values if possible.
+        var _next = unwindWork(workInProgress);
+        // Because this fiber did not complete, don't reset its expiration time.
+        if (workInProgress.effectTag & DidCapture) {
+          // Restarting an error boundary
+          stopFailedWorkTimer(workInProgress);
+        } else {
+          stopWorkTimer(workInProgress);
         }
 
-        // If this fiber had side-effects, we append it AFTER the children's
-        // side-effects. We can perform certain side-effects earlier if
-        // needed, by doing multiple passes over the effect list. We don't want
-        // to schedule our own side-effect on our own list because if end up
-        // reusing children we'll schedule this effect onto itself since we're
-        // at the end.
-        var effectTag = workInProgress.effectTag;
-        // Skip both NoWork and PerformedWork tags when creating the effect list.
-        // PerformedWork effect is read by React DevTools but shouldn't be committed.
-        if (effectTag > PerformedWork) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = workInProgress;
-          } else {
-            returnFiber.firstEffect = workInProgress;
+        {
+          ReactDebugCurrentFiber.resetCurrentFiber();
+        }
+
+        if (_next !== null) {
+          stopWorkTimer(workInProgress);
+          if (true && ReactFiberInstrumentation_1.debugTool) {
+            ReactFiberInstrumentation_1.debugTool.onCompleteWork(
+              workInProgress
+            );
           }
-          returnFiber.lastEffect = workInProgress;
+          // If completing this work spawned new work, do that next. We'll come
+          // back here again.
+          // Since we're restarting, remove anything that is not a host effect
+          // from the effect tag.
+          _next.effectTag &= HostEffectMask;
+          return _next;
         }
-      }
 
-      stopWorkTimer(workInProgress);
-      if (true && ReactFiberInstrumentation_1.debugTool) {
-        ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
-      }
+        if (returnFiber !== null) {
+          // Mark the parent fiber as incomplete and clear its effect list.
+          returnFiber.firstEffect = returnFiber.lastEffect = null;
+          returnFiber.effectTag |= Incomplete;
+        }
 
-      if (siblingFiber !== null) {
-        // If there is more work to do in this returnFiber, do that next.
-        return siblingFiber;
-      } else if (returnFiber !== null) {
-        // If there's no more work in this returnFiber. Complete the returnFiber.
-        workInProgress = returnFiber;
-        continue;
-      } else {
-        // We've reached the root.
-        var root = workInProgress.stateNode;
-        root.isReadyForCommit = true;
-        return null;
+        if (true && ReactFiberInstrumentation_1.debugTool) {
+          ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
+        }
+
+        if (siblingFiber !== null) {
+          // If there is more work to do in this returnFiber, do that next.
+          return siblingFiber;
+        } else if (returnFiber !== null) {
+          // If there's no more work in this returnFiber. Complete the returnFiber.
+          workInProgress = returnFiber;
+          continue;
+        } else {
+          return null;
+        }
       }
     }
 
@@ -11823,47 +12623,22 @@ var ReactFiberScheduler = function(config) {
       ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
     }
 
-    var next = beginWork(current, workInProgress, nextRenderExpirationTime);
-    {
-      ReactDebugCurrentFiber.resetCurrentFiber();
-    }
-    if (true && ReactFiberInstrumentation_1.debugTool) {
-      ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
-    }
-
-    if (next === null) {
-      // If this doesn't spawn new work, complete the current work.
-      next = completeUnitOfWork(workInProgress);
-    }
-
-    ReactCurrentOwner.current = null;
-
-    return next;
-  }
-
-  function performFailedUnitOfWork(workInProgress) {
-    {
-      ReactStrictModeWarnings.discardPendingWarnings();
-    }
-
-    // The current, flushed, state of this fiber is the alternate.
-    // Ideally nothing should rely on this, but relying on it here
-    // means that we don't need an additional field on the work in
-    // progress.
-    var current = workInProgress.alternate;
-
-    // See if beginning this work spawns more work.
-    startWorkTimer(workInProgress);
-    {
-      ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
+    if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+      stashedWorkInProgressProperties = assignFiberPropertiesInDEV(
+        stashedWorkInProgressProperties,
+        workInProgress
+      );
     }
-    var next = beginFailedWork(
-      current,
-      workInProgress,
-      nextRenderExpirationTime
-    );
+    var next = beginWork(current, workInProgress, nextRenderExpirationTime);
     {
       ReactDebugCurrentFiber.resetCurrentFiber();
+      if (isReplayingFailedUnitOfWork) {
+        // Currently replaying a failed unit of work. This should be unreachable,
+        // because the render phase is meant to be idempotent, and it should
+        // have thrown again. Since it didn't, rethrow the original error, so
+        // React's internal stack is not misaligned.
+        rethrowOriginalError();
+      }
     }
     if (true && ReactFiberInstrumentation_1.debugTool) {
       ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
@@ -11880,14 +12655,6 @@ var ReactFiberScheduler = function(config) {
   }
 
   function workLoop(isAsync) {
-    if (capturedErrors !== null) {
-      // If there are unhandled errors, switch to the slow work loop.
-      // TODO: How to avoid this check in the fast path? Maybe the renderer
-      // could keep track of which roots have unhandled errors and call a
-      // forked version of renderRoot.
-      slowWorkLoopThatChecksForFailedWork(isAsync);
-      return;
-    }
     if (!isAsync) {
       // Flush all expired work.
       while (nextUnitOfWork !== null) {
@@ -11901,47 +12668,6 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function slowWorkLoopThatChecksForFailedWork(isAsync) {
-    if (!isAsync) {
-      // Flush all expired work.
-      while (nextUnitOfWork !== null) {
-        if (hasCapturedError(nextUnitOfWork)) {
-          // Use a forked version of performUnitOfWork
-          nextUnitOfWork = performFailedUnitOfWork(nextUnitOfWork);
-        } else {
-          nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-        }
-      }
-    } else {
-      // Flush asynchronous work until the deadline runs out of time.
-      while (nextUnitOfWork !== null && !shouldYield()) {
-        if (hasCapturedError(nextUnitOfWork)) {
-          // Use a forked version of performUnitOfWork
-          nextUnitOfWork = performFailedUnitOfWork(nextUnitOfWork);
-        } else {
-          nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-        }
-      }
-    }
-  }
-
-  function renderRootCatchBlock(root, failedWork, boundary, isAsync) {
-    // We're going to restart the error boundary that captured the error.
-    // Conceptually, we're unwinding the stack. We need to unwind the
-    // context stack, too.
-    unwindContexts(failedWork, boundary);
-
-    // Restart the error boundary using a forked version of
-    // performUnitOfWork that deletes the boundary's children. The entire
-    // failed subree will be unmounted. During the commit phase, a special
-    // lifecycle method is called on the error boundary, which triggers
-    // a re-render.
-    nextUnitOfWork = performFailedUnitOfWork(boundary);
-
-    // Continue working.
-    workLoop(isAsync);
-  }
-
   function renderRoot(root, expirationTime, isAsync) {
     invariant(
       !isWorking,
@@ -11950,365 +12676,175 @@ var ReactFiberScheduler = function(config) {
     );
     isWorking = true;
 
-    // We're about to mutate the work-in-progress tree. If the root was pending
-    // commit, it no longer is: we'll need to complete it again.
-    root.isReadyForCommit = false;
-
     // Check if we're starting from a fresh stack, or if we're resuming from
     // previously yielded work.
     if (
-      root !== nextRoot ||
       expirationTime !== nextRenderExpirationTime ||
+      root !== nextRoot ||
       nextUnitOfWork === null
     ) {
       // Reset the stack and start working from the root.
-      resetContextStack();
+      resetStack();
       nextRoot = root;
       nextRenderExpirationTime = expirationTime;
       nextUnitOfWork = createWorkInProgress(
         nextRoot.current,
         null,
-        expirationTime
-      );
-    }
-
-    startWorkLoopTimer(nextUnitOfWork);
-
-    var didError = false;
-    var error = null;
-    {
-      invokeGuardedCallback$2(null, workLoop, null, isAsync);
-      if (hasCaughtError()) {
-        didError = true;
-        error = clearCaughtError();
-      }
-    }
-
-    // An error was thrown during the render phase.
-    while (didError) {
-      if (didFatal) {
-        // This was a fatal error. Don't attempt to recover from it.
-        firstUncaughtError = error;
-        break;
-      }
-
-      var failedWork = nextUnitOfWork;
-      if (failedWork === null) {
-        // An error was thrown but there's no current unit of work. This can
-        // happen during the commit phase if there's a bug in the renderer.
-        didFatal = true;
-        continue;
-      }
-
-      // "Capture" the error by finding the nearest boundary. If there is no
-      // error boundary, we use the root.
-      var boundary = captureError(failedWork, error);
-      invariant(
-        boundary !== null,
-        "Should have found an error boundary. This error is likely " +
-          "caused by a bug in React. Please file an issue."
-      );
-
-      if (didFatal) {
-        // The error we just captured was a fatal error. This happens
-        // when the error propagates to the root more than once.
-        continue;
-      }
-
-      didError = false;
-      error = null;
-      {
-        invokeGuardedCallback$2(
-          null,
-          renderRootCatchBlock,
-          null,
-          root,
-          failedWork,
-          boundary,
-          isAsync
-        );
-        if (hasCaughtError()) {
-          didError = true;
-          error = clearCaughtError();
-          continue;
-        }
-      }
-      // We're finished working. Exit the error loop.
-      break;
-    }
-
-    var uncaughtError = firstUncaughtError;
-
-    // We're done performing work. Time to clean up.
-    stopWorkLoopTimer(interruptedBy);
-    interruptedBy = null;
-    isWorking = false;
-    didFatal = false;
-    firstUncaughtError = null;
-
-    if (uncaughtError !== null) {
-      onUncaughtError(uncaughtError);
-    }
-
-    return root.isReadyForCommit ? root.current.alternate : null;
-  }
-
-  // Returns the boundary that captured the error, or null if the error is ignored
-  function captureError(failedWork, error) {
-    // It is no longer valid because we exited the user code.
-    ReactCurrentOwner.current = null;
-    {
-      ReactDebugCurrentFiber.resetCurrentFiber();
+        nextRenderExpirationTime
+      );
+      root.pendingCommitExpirationTime = NoWork;
     }
 
-    // Search for the nearest error boundary.
-    var boundary = null;
-
-    // Passed to logCapturedError()
-    var errorBoundaryFound = false;
-    var willRetry = false;
-    var errorBoundaryName = null;
+    var didFatal = false;
 
-    // Host containers are a special case. If the failed work itself is a host
-    // container, then it acts as its own boundary. In all other cases, we
-    // ignore the work itself and only search through the parents.
-    if (failedWork.tag === HostRoot) {
-      boundary = failedWork;
-
-      if (isFailedBoundary(failedWork)) {
-        // If this root already failed, there must have been an error when
-        // attempting to unmount it. This is a worst-case scenario and
-        // should only be possible if there's a bug in the renderer.
-        didFatal = true;
-      }
-    } else {
-      var node = failedWork["return"];
-      while (node !== null && boundary === null) {
-        if (node.tag === ClassComponent) {
-          var instance = node.stateNode;
-          if (typeof instance.componentDidCatch === "function") {
-            errorBoundaryFound = true;
-            errorBoundaryName = getComponentName(node);
+    startWorkLoopTimer(nextUnitOfWork);
 
-            // Found an error boundary!
-            boundary = node;
-            willRetry = true;
-          }
-        } else if (node.tag === HostRoot) {
-          // Treat the root like a no-op error boundary
-          boundary = node;
+    do {
+      try {
+        workLoop(isAsync);
+      } catch (thrownValue) {
+        if (nextUnitOfWork === null) {
+          // This is a fatal error.
+          didFatal = true;
+          onUncaughtError(thrownValue);
+          break;
         }
 
-        if (isFailedBoundary(node)) {
-          // This boundary is already in a failed state.
-
-          // If we're currently unmounting, that means this error was
-          // thrown while unmounting a failed subtree. We should ignore
-          // the error.
-          if (isUnmounting) {
-            return null;
-          }
-
-          // If we're in the commit phase, we should check to see if
-          // this boundary already captured an error during this commit.
-          // This case exists because multiple errors can be thrown during
-          // a single commit without interruption.
-          if (
-            commitPhaseBoundaries !== null &&
-            (commitPhaseBoundaries.has(node) ||
-              (node.alternate !== null &&
-                commitPhaseBoundaries.has(node.alternate)))
-          ) {
-            // If so, we should ignore this error.
-            return null;
-          }
-
-          // The error should propagate to the next boundary -— we keep looking.
-          boundary = null;
-          willRetry = false;
+        if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+          var failedUnitOfWork = nextUnitOfWork;
+          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
         }
 
-        node = node["return"];
-      }
-    }
-
-    if (boundary !== null) {
-      // Add to the collection of failed boundaries. This lets us know that
-      // subsequent errors in this subtree should propagate to the next boundary.
-      if (failedBoundaries === null) {
-        failedBoundaries = new Set();
-      }
-      failedBoundaries.add(boundary);
-
-      // This method is unsafe outside of the begin and complete phases.
-      // We might be in the commit phase when an error is captured.
-      // The risk is that the return path from this Fiber may not be accurate.
-      // That risk is acceptable given the benefit of providing users more context.
-      var _componentStack = getStackAddendumByWorkInProgressFiber(failedWork);
-      var _componentName = getComponentName(failedWork);
-
-      // Add to the collection of captured errors. This is stored as a global
-      // map of errors and their component stack location keyed by the boundaries
-      // that capture them. We mostly use this Map as a Set; it's a Map only to
-      // avoid adding a field to Fiber to store the error.
-      if (capturedErrors === null) {
-        capturedErrors = new Map();
+        var sourceFiber = nextUnitOfWork;
+        var returnFiber = sourceFiber["return"];
+        if (returnFiber === null) {
+          // This is the root. The root could capture its own errors. However,
+          // we don't know if it errors before or after we pushed the host
+          // context. This information is needed to avoid a stack mismatch.
+          // Because we're not sure, treat this as a fatal error. We could track
+          // which phase it fails in, but doesn't seem worth it. At least
+          // for now.
+          didFatal = true;
+          onUncaughtError(thrownValue);
+          break;
+        }
+        throwException(returnFiber, sourceFiber, thrownValue);
+        nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
+      break;
+    } while (true);
 
-      var capturedError = {
-        componentName: _componentName,
-        componentStack: _componentStack,
-        error: error,
-        errorBoundary: errorBoundaryFound ? boundary.stateNode : null,
-        errorBoundaryFound: errorBoundaryFound,
-        errorBoundaryName: errorBoundaryName,
-        willRetry: willRetry
-      };
-
-      capturedErrors.set(boundary, capturedError);
+    // We're done performing work. Time to clean up.
+    var didCompleteRoot = false;
+    isWorking = false;
 
-      try {
-        logCapturedError(capturedError);
-      } catch (e) {
-        // Prevent cycle if logCapturedError() throws.
-        // A cycle may still occur if logCapturedError renders a component that throws.
-        var suppressLogging = e && e.suppressReactErrorLogging;
-        if (!suppressLogging) {
-          console.error(e);
-        }
+    // Yield back to main thread.
+    if (didFatal) {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
+      // There was a fatal error.
+      {
+        stack.resetStackAfterFatalErrorInDev();
       }
-
-      // If we're in the commit phase, defer scheduling an update on the
-      // boundary until after the commit is complete
-      if (isCommitting) {
-        if (commitPhaseBoundaries === null) {
-          commitPhaseBoundaries = new Set();
-        }
-        commitPhaseBoundaries.add(boundary);
+      return null;
+    } else if (nextUnitOfWork === null) {
+      // We reached the root.
+      if (isRootReadyForCommit) {
+        didCompleteRoot = true;
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
+        // The root successfully completed. It's ready for commit.
+        root.pendingCommitExpirationTime = expirationTime;
+        var finishedWork = root.current.alternate;
+        return finishedWork;
       } else {
-        // Otherwise, schedule an update now.
-        // TODO: Is this actually necessary during the render phase? Is it
-        // possible to unwind and continue rendering at the same priority,
-        // without corrupting internal state?
-        scheduleErrorRecovery(boundary);
+        // The root did not complete.
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
+        invariant(
+          false,
+          "Expired work should have completed. This error is likely caused " +
+            "by a bug in React. Please file an issue."
+        );
       }
-      return boundary;
-    } else if (firstUncaughtError === null) {
-      // If no boundary is found, we'll need to throw the error
-      firstUncaughtError = error;
+    } else {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
+      // There's more work to do, but we ran out of time. Yield back to
+      // the renderer.
+      return null;
     }
-    return null;
-  }
-
-  function hasCapturedError(fiber) {
-    // TODO: capturedErrors should store the boundary instance, to avoid needing
-    // to check the alternate.
-    return (
-      capturedErrors !== null &&
-      (capturedErrors.has(fiber) ||
-        (fiber.alternate !== null && capturedErrors.has(fiber.alternate)))
-    );
   }
 
-  function isFailedBoundary(fiber) {
-    // TODO: failedBoundaries should store the boundary instance, to avoid
-    // needing to check the alternate.
-    return (
-      failedBoundaries !== null &&
-      (failedBoundaries.has(fiber) ||
-        (fiber.alternate !== null && failedBoundaries.has(fiber.alternate)))
-    );
+  function scheduleCapture(sourceFiber, boundaryFiber, value, expirationTime) {
+    // TODO: We only support dispatching errors.
+    var capturedValue = createCapturedValue(value, sourceFiber);
+    var update = {
+      expirationTime: expirationTime,
+      partialState: null,
+      callback: null,
+      isReplace: false,
+      isForced: false,
+      capturedValue: capturedValue,
+      next: null
+    };
+    insertUpdateIntoFiber(boundaryFiber, update);
+    scheduleWork(boundaryFiber, expirationTime);
   }
 
-  function commitErrorHandling(effectfulFiber) {
-    var capturedError = void 0;
-    if (capturedErrors !== null) {
-      capturedError = capturedErrors.get(effectfulFiber);
-      capturedErrors["delete"](effectfulFiber);
-      if (capturedError == null) {
-        if (effectfulFiber.alternate !== null) {
-          effectfulFiber = effectfulFiber.alternate;
-          capturedError = capturedErrors.get(effectfulFiber);
-          capturedErrors["delete"](effectfulFiber);
-        }
-      }
-    }
-
+  function dispatch(sourceFiber, value, expirationTime) {
     invariant(
-      capturedError != null,
-      "No error for given unit of work. This error is likely caused by a " +
-        "bug in React. Please file an issue."
+      !isWorking || isCommitting,
+      "dispatch: Cannot dispatch during the render phase."
     );
 
-    switch (effectfulFiber.tag) {
-      case ClassComponent:
-        var instance = effectfulFiber.stateNode;
-
-        var info = {
-          componentStack: capturedError.componentStack
-        };
-
-        // Allow the boundary to handle the error, usually by scheduling
-        // an update to itself
-        instance.componentDidCatch(capturedError.error, info);
-        return;
-      case HostRoot:
-        if (firstUncaughtError === null) {
-          firstUncaughtError = capturedError.error;
-        }
-        return;
-      default:
-        invariant(
-          false,
-          "Invalid type of work. This error is likely caused by a bug in " +
-            "React. Please file an issue."
-        );
-    }
-  }
+    // TODO: Handle arrays
 
-  function unwindContexts(from, to) {
-    var node = from;
-    while (node !== null) {
-      switch (node.tag) {
+    var fiber = sourceFiber["return"];
+    while (fiber !== null) {
+      switch (fiber.tag) {
         case ClassComponent:
-          popContextProvider(node);
-          break;
-        case HostComponent:
-          popHostContext(node);
+          var ctor = fiber.type;
+          var instance = fiber.stateNode;
+          if (
+            typeof ctor.getDerivedStateFromCatch === "function" ||
+            (typeof instance.componentDidCatch === "function" &&
+              !isAlreadyFailedLegacyErrorBoundary(instance))
+          ) {
+            scheduleCapture(sourceFiber, fiber, value, expirationTime);
+            return;
+          }
           break;
+        // TODO: Handle async boundaries
         case HostRoot:
-          popHostContainer(node);
-          break;
-        case HostPortal:
-          popHostContainer(node);
-          break;
-        case ContextProvider:
-          popProvider(node);
-          break;
-      }
-      if (node === to || node.alternate === to) {
-        stopFailedWorkTimer(node);
-        break;
-      } else {
-        stopWorkTimer(node);
+          scheduleCapture(sourceFiber, fiber, value, expirationTime);
+          return;
       }
-      node = node["return"];
+      fiber = fiber["return"];
+    }
+
+    if (sourceFiber.tag === HostRoot) {
+      // Error was thrown at the root. There is no parent, so the root
+      // itself should capture it.
+      scheduleCapture(sourceFiber, sourceFiber, value, expirationTime);
     }
   }
 
-  function computeAsyncExpiration() {
+  function onCommitPhaseError(fiber, error) {
+    return dispatch(fiber, error, Sync);
+  }
+
+  function computeAsyncExpiration(currentTime) {
     // Given the current clock time, returns an expiration time. We use rounding
     // to batch like updates together.
     // Should complete within ~1000ms. 1200ms max.
-    var currentTime = recalculateCurrentTime();
-    var expirationMs = 1000;
-    var bucketSizeMs = 200;
+    var expirationMs = 5000;
+    var bucketSizeMs = 250;
     return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
   }
 
-  function computeInteractiveExpiration() {
+  function computeInteractiveExpiration(currentTime) {
     // Should complete within ~500ms. 600ms max.
-    var currentTime = recalculateCurrentTime();
     var expirationMs = 500;
     var bucketSizeMs = 100;
     return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
@@ -12316,7 +12852,8 @@ var ReactFiberScheduler = function(config) {
 
   // Creates a unique async expiration time.
   function computeUniqueAsyncExpiration() {
-    var result = computeAsyncExpiration();
+    var currentTime = recalculateCurrentTime();
+    var result = computeAsyncExpiration(currentTime);
     if (result <= lastUniqueAsyncExpiration) {
       // Since we assume the current time monotonically increases, we only hit
       // this branch when computeUniqueAsyncExpiration is fired multiple times
@@ -12348,10 +12885,12 @@ var ReactFiberScheduler = function(config) {
       if (fiber.mode & AsyncMode) {
         if (isBatchingInteractiveUpdates) {
           // This is an interactive update
-          expirationTime = computeInteractiveExpiration();
+          var currentTime = recalculateCurrentTime();
+          expirationTime = computeInteractiveExpiration(currentTime);
         } else {
           // This is an async update
-          expirationTime = computeAsyncExpiration();
+          var _currentTime = recalculateCurrentTime();
+          expirationTime = computeAsyncExpiration(_currentTime);
         }
       } else {
         // This is a sync update
@@ -12376,23 +12915,6 @@ var ReactFiberScheduler = function(config) {
     return scheduleWorkImpl(fiber, expirationTime, false);
   }
 
-  function checkRootNeedsClearing(root, fiber, expirationTime) {
-    if (
-      !isWorking &&
-      root === nextRoot &&
-      expirationTime < nextRenderExpirationTime
-    ) {
-      // Restart the root from the top.
-      if (nextUnitOfWork !== null) {
-        // This is an interruption. (Used for performance tracking.)
-        interruptedBy = fiber;
-      }
-      nextRoot = null;
-      nextUnitOfWork = null;
-      nextRenderExpirationTime = NoWork;
-    }
-  }
-
   function scheduleWorkImpl(fiber, expirationTime, isErrorRecovery) {
     recordScheduleUpdate();
 
@@ -12424,10 +12946,35 @@ var ReactFiberScheduler = function(config) {
       if (node["return"] === null) {
         if (node.tag === HostRoot) {
           var root = node.stateNode;
-
-          checkRootNeedsClearing(root, fiber, expirationTime);
-          requestWork(root, expirationTime);
-          checkRootNeedsClearing(root, fiber, expirationTime);
+          if (
+            !isWorking &&
+            nextRenderExpirationTime !== NoWork &&
+            expirationTime < nextRenderExpirationTime
+          ) {
+            // This is an interruption. (Used for performance tracking.)
+            interruptedBy = fiber;
+            resetStack();
+          }
+          if (
+            // If we're in the render phase, we don't need to schedule this root
+            // for an update, because we'll do it before we exit...
+            !isWorking ||
+            isCommitting ||
+            // ...unless this is a different root than the one we're rendering.
+            nextRoot !== root
+          ) {
+            // Add this root to the root schedule.
+            requestWork(root, expirationTime);
+          }
+          if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
+            invariant(
+              false,
+              "Maximum update depth exceeded. This can happen when a " +
+                "component repeatedly calls setState inside " +
+                "componentWillUpdate or componentDidUpdate. React limits " +
+                "the number of nested updates to prevent infinite loops."
+            );
+          }
         } else {
           {
             if (!isErrorRecovery && fiber.tag === ClassComponent) {
@@ -12441,27 +12988,23 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function scheduleErrorRecovery(fiber) {
-    scheduleWorkImpl(fiber, Sync, true);
-  }
-
   function recalculateCurrentTime() {
     // Subtract initial time so it fits inside 32bits
-    var ms = now() - startTime;
-    mostRecentCurrentTime = msToExpirationTime(ms);
+    mostRecentCurrentTimeMs = now() - originalStartTimeMs;
+    mostRecentCurrentTime = msToExpirationTime(mostRecentCurrentTimeMs);
     return mostRecentCurrentTime;
   }
 
   function deferredUpdates(fn) {
     var previousExpirationContext = expirationContext;
-    expirationContext = computeAsyncExpiration();
+    var currentTime = recalculateCurrentTime();
+    expirationContext = computeAsyncExpiration(currentTime);
     try {
       return fn();
     } finally {
       expirationContext = previousExpirationContext;
     }
   }
-
   function syncUpdates(fn, a, b, c, d) {
     var previousExpirationContext = expirationContext;
     expirationContext = Sync;
@@ -12519,7 +13062,7 @@ var ReactFiberScheduler = function(config) {
     }
 
     // Compute a timeout for the given expiration time.
-    var currentMs = now() - startTime;
+    var currentMs = now() - originalStartTimeMs;
     var expirationMs = expirationTimeToMs(expirationTime);
     var timeout = expirationMs - currentMs;
 
@@ -12532,16 +13075,35 @@ var ReactFiberScheduler = function(config) {
   // requestWork is called by the scheduler whenever a root receives an update.
   // It's up to the renderer to call renderRoot at some point in the future.
   function requestWork(root, expirationTime) {
-    if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
-      invariant(
-        false,
-        "Maximum update depth exceeded. This can happen when a " +
-          "component repeatedly calls setState inside componentWillUpdate or " +
-          "componentDidUpdate. React limits the number of nested updates to " +
-          "prevent infinite loops."
-      );
+    addRootToSchedule(root, expirationTime);
+
+    if (isRendering) {
+      // Prevent reentrancy. Remaining work will be scheduled at the end of
+      // the currently rendering batch.
+      return;
+    }
+
+    if (isBatchingUpdates) {
+      // Flush work at the end of the batch.
+      if (isUnbatchingUpdates) {
+        // ...unless we're inside unbatchedUpdates, in which case we should
+        // flush it now.
+        nextFlushedRoot = root;
+        nextFlushedExpirationTime = Sync;
+        performWorkOnRoot(root, Sync, false);
+      }
+      return;
+    }
+
+    // TODO: Get rid of Sync and use current time?
+    if (expirationTime === Sync) {
+      performSyncWork();
+    } else {
+      scheduleCallbackWithExpiration(expirationTime);
     }
+  }
 
+  function addRootToSchedule(root, expirationTime) {
     // Add the root to the schedule.
     // Check if this root is already part of the schedule.
     if (root.nextScheduledRoot === null) {
@@ -12566,37 +13128,11 @@ var ReactFiberScheduler = function(config) {
         root.remainingExpirationTime = expirationTime;
       }
     }
-
-    if (isRendering) {
-      // Prevent reentrancy. Remaining work will be scheduled at the end of
-      // the currently rendering batch.
-      return;
-    }
-
-    if (isBatchingUpdates) {
-      if (isUnbatchingUpdates) {
-        // Flush work at the end of the batch.
-        // ...unless we're inside unbatchedUpdates, in which case we should
-        // flush it now.
-        nextFlushedRoot = root;
-        nextFlushedExpirationTime = Sync;
-        performWorkOnRoot(root, Sync, false);
-      }
-      return;
-    }
-
-    // TODO: Get rid of Sync and use current time?
-    if (expirationTime === Sync) {
-      performSyncWork();
-    } else {
-      scheduleCallbackWithExpiration(expirationTime);
-    }
   }
 
   function findHighestPriorityRoot() {
     var highestPriorityWork = NoWork;
     var highestPriorityRoot = null;
-
     if (lastScheduledRoot !== null) {
       var previousScheduledRoot = lastScheduledRoot;
       var root = firstScheduledRoot;
@@ -12658,7 +13194,8 @@ var ReactFiberScheduler = function(config) {
     var previousFlushedRoot = nextFlushedRoot;
     if (
       previousFlushedRoot !== null &&
-      previousFlushedRoot === highestPriorityRoot
+      previousFlushedRoot === highestPriorityRoot &&
+      highestPriorityWork === Sync
     ) {
       nestedUpdateCount++;
     } else {
@@ -12686,7 +13223,8 @@ var ReactFiberScheduler = function(config) {
 
     if (enableUserTimingAPI && deadline !== null) {
       var didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-      stopRequestCallbackTimer(didExpire);
+      var timeout = expirationTimeToMs(nextFlushedExpirationTime);
+      stopRequestCallbackTimer(didExpire, timeout);
     }
 
     if (isAsync) {
@@ -12733,7 +13271,6 @@ var ReactFiberScheduler = function(config) {
     // Clean-up.
     deadline = null;
     deadlineDidExpire = false;
-    nestedUpdateCount = 0;
 
     finishRendering();
   }
@@ -12747,11 +13284,17 @@ var ReactFiberScheduler = function(config) {
     // Perform work on root as if the given expiration time is the current time.
     // This has the effect of synchronously flushing all work up to and
     // including the given time.
+    nextFlushedRoot = root;
+    nextFlushedExpirationTime = expirationTime;
     performWorkOnRoot(root, expirationTime, false);
+    // Flush any sync work that was scheduled by lifecycles
+    performSyncWork();
     finishRendering();
   }
 
   function finishRendering() {
+    nestedUpdateCount = 0;
+
     if (completedBatches !== null) {
       var batches = completedBatches;
       completedBatches = null;
@@ -12769,10 +13312,10 @@ var ReactFiberScheduler = function(config) {
     }
 
     if (hasUnhandledError) {
-      var _error4 = unhandledError;
+      var error = unhandledError;
       unhandledError = null;
       hasUnhandledError = false;
-      throw _error4;
+      throw error;
     }
   }
 
@@ -12865,8 +13408,6 @@ var ReactFiberScheduler = function(config) {
     return true;
   }
 
-  // TODO: Not happy about this hook. Conceptually, renderRoot should return a
-  // tuple of (isReadyForCommit, didError, error)
   function onUncaughtError(error) {
     invariant(
       nextFlushedRoot !== null,
@@ -12983,6 +13524,7 @@ var ReactFiberScheduler = function(config) {
   }
 
   return {
+    recalculateCurrentTime: recalculateCurrentTime,
     computeExpirationForFiber: computeExpirationForFiber,
     scheduleWork: scheduleWork,
     requestWork: requestWork,
@@ -12995,7 +13537,8 @@ var ReactFiberScheduler = function(config) {
     syncUpdates: syncUpdates,
     interactiveUpdates: interactiveUpdates,
     flushInteractiveUpdates: flushInteractiveUpdates,
-    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration
+    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration,
+    legacyContext: legacyContext
   };
 };
 
@@ -13008,24 +13551,13 @@ var didWarnAboutNestedUpdates = void 0;
 // 0 is PROD, 1 is DEV.
 // Might add PROFILE later.
 
-function getContextForSubtree(parentComponent) {
-  if (!parentComponent) {
-    return emptyObject;
-  }
-
-  var fiber = get(parentComponent);
-  var parentContext = findCurrentUnmaskedContext(fiber);
-  return isContextProvider(fiber)
-    ? processChildContext(fiber, parentContext)
-    : parentContext;
-}
-
 var ReactFiberReconciler$1 = function(config) {
   var getPublicInstance = config.getPublicInstance;
 
   var _ReactFiberScheduler = ReactFiberScheduler(config),
     computeUniqueAsyncExpiration =
       _ReactFiberScheduler.computeUniqueAsyncExpiration,
+    recalculateCurrentTime = _ReactFiberScheduler.recalculateCurrentTime,
     computeExpirationForFiber = _ReactFiberScheduler.computeExpirationForFiber,
     scheduleWork = _ReactFiberScheduler.scheduleWork,
     requestWork = _ReactFiberScheduler.requestWork,
@@ -13037,9 +13569,32 @@ var ReactFiberReconciler$1 = function(config) {
     deferredUpdates = _ReactFiberScheduler.deferredUpdates,
     syncUpdates = _ReactFiberScheduler.syncUpdates,
     interactiveUpdates = _ReactFiberScheduler.interactiveUpdates,
-    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates;
+    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates,
+    legacyContext = _ReactFiberScheduler.legacyContext;
+
+  var findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
+
+  function getContextForSubtree(parentComponent) {
+    if (!parentComponent) {
+      return emptyObject;
+    }
+
+    var fiber = get(parentComponent);
+    var parentContext = findCurrentUnmaskedContext(fiber);
+    return isContextProvider(fiber)
+      ? processChildContext(fiber, parentContext)
+      : parentContext;
+  }
 
-  function scheduleRootUpdate(current, element, expirationTime, callback) {
+  function scheduleRootUpdate(
+    current,
+    element,
+    currentTime,
+    expirationTime,
+    callback
+  ) {
     {
       if (
         ReactDebugCurrentFiber.phase === "render" &&
@@ -13060,12 +13615,14 @@ var ReactFiberReconciler$1 = function(config) {
 
     callback = callback === undefined ? null : callback;
     {
-      warning(
-        callback === null || typeof callback === "function",
-        "render(...): Expected the last optional `callback` argument to be a " +
-          "function. Instead received: %s.",
-        callback
-      );
+      !(callback === null || typeof callback === "function")
+        ? warning(
+            false,
+            "render(...): Expected the last optional `callback` argument to be a " +
+              "function. Instead received: %s.",
+            callback
+          )
+        : void 0;
     }
 
     var update = {
@@ -13074,6 +13631,7 @@ var ReactFiberReconciler$1 = function(config) {
       callback: callback,
       isReplace: false,
       isForced: false,
+      capturedValue: null,
       next: null
     };
     insertUpdateIntoFiber(current, update);
@@ -13086,6 +13644,7 @@ var ReactFiberReconciler$1 = function(config) {
     element,
     container,
     parentComponent,
+    currentTime,
     expirationTime,
     callback
   ) {
@@ -13111,7 +13670,13 @@ var ReactFiberReconciler$1 = function(config) {
       container.pendingContext = context;
     }
 
-    return scheduleRootUpdate(current, element, expirationTime, callback);
+    return scheduleRootUpdate(
+      current,
+      element,
+      currentTime,
+      expirationTime,
+      callback
+    );
   }
 
   function findHostInstance(fiber) {
@@ -13128,17 +13693,34 @@ var ReactFiberReconciler$1 = function(config) {
     },
     updateContainer: function(element, container, parentComponent, callback) {
       var current = container.current;
+      var currentTime = recalculateCurrentTime();
       var expirationTime = computeExpirationForFiber(current);
       return updateContainerAtExpirationTime(
         element,
         container,
         parentComponent,
+        currentTime,
+        expirationTime,
+        callback
+      );
+    },
+    updateContainerAtExpirationTime: function(
+      element,
+      container,
+      parentComponent,
+      expirationTime,
+      callback
+    ) {
+      var currentTime = recalculateCurrentTime();
+      return updateContainerAtExpirationTime(
+        element,
+        container,
+        parentComponent,
+        currentTime,
         expirationTime,
         callback
       );
     },
-
-    updateContainerAtExpirationTime: updateContainerAtExpirationTime,
 
     flushRoot: flushRoot,
 
@@ -13220,6 +13802,48 @@ var reactReconciler = ReactFiberReconciler$3["default"]
   ? ReactFiberReconciler$3["default"]
   : ReactFiberReconciler$3;
 
+/**
+ * Keeps track of allocating and associating native "tags" which are numeric,
+ * unique view IDs. All the native tags are negative numbers, to avoid
+ * collisions, but in the JS we keep track of them as positive integers to store
+ * them effectively in Arrays. So we must refer to them as "inverses" of the
+ * native tags (that are * normally negative).
+ *
+ * It *must* be the case that every `rootNodeID` always maps to the exact same
+ * `tag` forever. The easiest way to accomplish this is to never delete
+ * anything from this table.
+ * Why: Because `dangerouslyReplaceNodeWithMarkupByID` relies on being able to
+ * unmount a component with a `rootNodeID`, then mount a new one in its place,
+ */
+var INITIAL_TAG_COUNT = 1;
+var ReactNativeTagHandles = {
+  tagsStartAt: INITIAL_TAG_COUNT,
+  tagCount: INITIAL_TAG_COUNT,
+
+  allocateTag: function() {
+    // Skip over root IDs as those are reserved for native
+    while (this.reactTagIsNativeTopRootID(ReactNativeTagHandles.tagCount)) {
+      ReactNativeTagHandles.tagCount++;
+    }
+    var tag = ReactNativeTagHandles.tagCount;
+    ReactNativeTagHandles.tagCount++;
+    return tag;
+  },
+
+  assertRootTag: function(tag) {
+    invariant(
+      this.reactTagIsNativeTopRootID(tag),
+      "Expect a native root tag, instead got %s",
+      tag
+    );
+  },
+
+  reactTagIsNativeTopRootID: function(reactTag) {
+    // We reserve all tags that are 1 mod 10 for native root views
+    return reactTag % 10 === 1;
+  }
+};
+
 function _classCallCheck$2(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
     throw new TypeError("Cannot call a class as a function");
@@ -13655,8 +14279,7 @@ var ReactFabric = {
     NativeMethodsMixin: NativeMethodsMixin,
     // Used by react-native-github/Libraries/ components
     ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin, // requireNativeComponent
-    ReactGlobalSharedState: ReactGlobalSharedState, // Systrace
-    ReactNativeComponentTree: ReactNativeComponentTree, // InspectorUtils, ScrollResponder
+    ReactNativeComponentTree: ReactNativeComponentTree, // ScrollResponder
     ReactNativePropRegistry: ReactNativePropRegistry, // flattenStyle, Stylesheet
     TouchHistoryMath: TouchHistoryMath, // PanResponder
     createReactNativeComponentClass: createReactNativeComponentClass, // RCTText, RCTView, ReactNativeART
diff --git a/Libraries/Renderer/ReactFabric-prod.js b/Libraries/Renderer/ReactFabric-prod.js
index d4d20d3ac85504..c12ebd601c84d0 100644
--- a/Libraries/Renderer/ReactFabric-prod.js
+++ b/Libraries/Renderer/ReactFabric-prod.js
@@ -13,80 +13,15 @@
 require("InitializeCore");
 var invariant = require("fbjs/lib/invariant"),
   emptyFunction = require("fbjs/lib/emptyFunction"),
-  RCTEventEmitter = require("RCTEventEmitter"),
   UIManager = require("UIManager"),
-  React = require("react"),
   TextInputState = require("TextInputState"),
   deepDiffer = require("deepDiffer"),
   flattenStyle = require("flattenStyle"),
+  React = require("react"),
   emptyObject = require("fbjs/lib/emptyObject"),
   shallowEqual = require("fbjs/lib/shallowEqual"),
-  FabricUIManager = require("FabricUIManager");
-function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
-  this._hasCaughtError = !1;
-  this._caughtError = null;
-  var funcArgs = Array.prototype.slice.call(arguments, 3);
-  try {
-    func.apply(context, funcArgs);
-  } catch (error) {
-    (this._caughtError = error), (this._hasCaughtError = !0);
-  }
-}
-var ReactErrorUtils = {
-  _caughtError: null,
-  _hasCaughtError: !1,
-  _rethrowError: null,
-  _hasRethrowError: !1,
-  invokeGuardedCallback: function(name, func, context, a, b, c, d, e, f) {
-    invokeGuardedCallback.apply(ReactErrorUtils, arguments);
-  },
-  invokeGuardedCallbackAndCatchFirstError: function(
-    name,
-    func,
-    context,
-    a,
-    b,
-    c,
-    d,
-    e,
-    f
-  ) {
-    ReactErrorUtils.invokeGuardedCallback.apply(this, arguments);
-    if (ReactErrorUtils.hasCaughtError()) {
-      var error = ReactErrorUtils.clearCaughtError();
-      ReactErrorUtils._hasRethrowError ||
-        ((ReactErrorUtils._hasRethrowError = !0),
-        (ReactErrorUtils._rethrowError = error));
-    }
-  },
-  rethrowCaughtError: function() {
-    return rethrowCaughtError.apply(ReactErrorUtils, arguments);
-  },
-  hasCaughtError: function() {
-    return ReactErrorUtils._hasCaughtError;
-  },
-  clearCaughtError: function() {
-    if (ReactErrorUtils._hasCaughtError) {
-      var error = ReactErrorUtils._caughtError;
-      ReactErrorUtils._caughtError = null;
-      ReactErrorUtils._hasCaughtError = !1;
-      return error;
-    }
-    invariant(
-      !1,
-      "clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
-};
-function rethrowCaughtError() {
-  if (ReactErrorUtils._hasRethrowError) {
-    var error = ReactErrorUtils._rethrowError;
-    ReactErrorUtils._rethrowError = null;
-    ReactErrorUtils._hasRethrowError = !1;
-    throw error;
-  }
-}
-var eventPluginOrder = null,
+  FabricUIManager = require("FabricUIManager"),
+  eventPluginOrder = null,
   namesToPlugins = {};
 function recomputePluginOrdering() {
   if (eventPluginOrder)
@@ -175,17 +110,6 @@ function isMoveish(topLevelType) {
 function isStartish(topLevelType) {
   return "topMouseDown" === topLevelType || "topTouchStart" === topLevelType;
 }
-function executeDispatch(event, simulated, listener, inst) {
-  simulated = event.type || "unknown-event";
-  event.currentTarget = getNodeFromInstance(inst);
-  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
-    simulated,
-    listener,
-    void 0,
-    event
-  );
-  event.currentTarget = null;
-}
 function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners,
     dispatchInstance = event._dispatchInstances;
@@ -218,26 +142,6 @@ function accumulateInto(current, next) {
 function forEachAccumulated(arr, cb, scope) {
   Array.isArray(arr) ? arr.forEach(cb, scope) : arr && cb.call(scope, arr);
 }
-var eventQueue = null;
-function executeDispatchesAndReleaseTopLevel(e) {
-  if (e) {
-    var dispatchListeners = e._dispatchListeners,
-      dispatchInstances = e._dispatchInstances;
-    if (Array.isArray(dispatchListeners))
-      for (
-        var i = 0;
-        i < dispatchListeners.length && !e.isPropagationStopped();
-        i++
-      )
-        executeDispatch(e, !1, dispatchListeners[i], dispatchInstances[i]);
-    else
-      dispatchListeners &&
-        executeDispatch(e, !1, dispatchListeners, dispatchInstances);
-    e._dispatchListeners = null;
-    e._dispatchInstances = null;
-    e.isPersistent() || e.constructor.release(e);
-  }
-}
 var injection = {
   injectEventPluginOrder: function(injectedEventPluginOrder) {
     invariant(
@@ -942,6 +846,7 @@ var eventTypes = {
       nativeEvent,
       nativeEventTarget
     ) {
+      if (null == targetInst) return null;
       var bubbleDispatchConfig = customBubblingEventTypes[topLevelType],
         directDispatchConfig = customDirectEventTypes[topLevelType];
       invariant(
@@ -987,160 +892,28 @@ function getInstanceFromTag(tag) {
   return "number" === typeof tag ? instanceCache[tag] || null : tag;
 }
 var ReactNativeComponentTree = Object.freeze({
-    precacheFiberNode: function(hostInst, tag) {
-      instanceCache[tag] = hostInst;
-    },
-    uncacheFiberNode: function(tag) {
-      delete instanceCache[tag];
-      delete instanceProps[tag];
-    },
-    getClosestInstanceFromNode: getInstanceFromTag,
-    getInstanceFromNode: getInstanceFromTag,
-    getNodeFromInstance: function(inst) {
-      var tag = inst.stateNode._nativeTag;
-      void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
-      invariant(tag, "All native instances should have a tag.");
-      return tag;
-    },
-    getFiberCurrentPropsFromNode: function(stateNode) {
-      return instanceProps[stateNode._nativeTag] || null;
-    },
-    updateFiberProps: function(tag, props) {
-      instanceProps[tag] = props;
-    }
-  }),
-  restoreTarget = null,
-  restoreQueue = null;
-function restoreStateOfTarget(target) {
-  if ((target = getInstanceFromNode(target))) {
-    invariant(
-      null,
-      "Fiber needs to be injected to handle a fiber target for controlled events. This error is likely caused by a bug in React. Please file an issue."
-    );
-    var props = getFiberCurrentPropsFromNode(target.stateNode);
-    null.restoreControlledState(target.stateNode, target.type, props);
-  }
-}
-function _batchedUpdates(fn, bookkeeping) {
-  return fn(bookkeeping);
-}
-function _flushInteractiveUpdates() {}
-var isBatching = !1;
-function batchedUpdates(fn, bookkeeping) {
-  if (isBatching) return fn(bookkeeping);
-  isBatching = !0;
-  try {
-    return _batchedUpdates(fn, bookkeeping);
-  } finally {
-    if (((isBatching = !1), null !== restoreTarget || null !== restoreQueue))
-      if (
-        (_flushInteractiveUpdates(),
-        restoreTarget &&
-          ((bookkeeping = restoreTarget),
-          (fn = restoreQueue),
-          (restoreQueue = restoreTarget = null),
-          restoreStateOfTarget(bookkeeping),
-          fn))
-      )
-        for (bookkeeping = 0; bookkeeping < fn.length; bookkeeping++)
-          restoreStateOfTarget(fn[bookkeeping]);
-  }
-}
-var ReactNativeTagHandles = {
-    tagsStartAt: 1,
-    tagCount: 1,
-    allocateTag: function() {
-      for (; this.reactTagIsNativeTopRootID(ReactNativeTagHandles.tagCount); )
-        ReactNativeTagHandles.tagCount++;
-      var tag = ReactNativeTagHandles.tagCount;
-      ReactNativeTagHandles.tagCount++;
-      return tag;
-    },
-    assertRootTag: function(tag) {
-      invariant(
-        this.reactTagIsNativeTopRootID(tag),
-        "Expect a native root tag, instead got %s",
-        tag
-      );
-    },
-    reactTagIsNativeTopRootID: function(reactTag) {
-      return 1 === reactTag % 10;
-    }
+  precacheFiberNode: function(hostInst, tag) {
+    instanceCache[tag] = hostInst;
   },
-  EMPTY_NATIVE_EVENT = {};
-function _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam) {
-  var nativeEvent = nativeEventParam || EMPTY_NATIVE_EVENT,
-    inst = getInstanceFromTag(rootNodeID);
-  batchedUpdates(function() {
-    var events = nativeEvent.target;
-    for (var events$jscomp$0 = null, i = 0; i < plugins.length; i++) {
-      var possiblePlugin = plugins[i];
-      possiblePlugin &&
-        (possiblePlugin = possiblePlugin.extractEvents(
-          topLevelType,
-          inst,
-          nativeEvent,
-          events
-        )) &&
-        (events$jscomp$0 = accumulateInto(events$jscomp$0, possiblePlugin));
-    }
-    events = events$jscomp$0;
-    null !== events && (eventQueue = accumulateInto(eventQueue, events));
-    events = eventQueue;
-    eventQueue = null;
-    events &&
-      (forEachAccumulated(events, executeDispatchesAndReleaseTopLevel),
-      invariant(
-        !eventQueue,
-        "processEventQueue(): Additional events were enqueued while processing an event queue. Support for this has not yet been implemented."
-      ),
-      ReactErrorUtils.rethrowCaughtError());
-  });
-}
-var ReactNativeEventEmitter = Object.freeze({
-  getListener: getListener,
-  registrationNames: registrationNameModules,
-  _receiveRootNodeIDEvent: _receiveRootNodeIDEvent,
-  receiveEvent: function(rootNodeID, topLevelType, nativeEventParam) {
-    _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam);
+  uncacheFiberNode: function(tag) {
+    delete instanceCache[tag];
+    delete instanceProps[tag];
   },
-  receiveTouches: function(eventTopLevelType, touches, changedIndices) {
-    if (
-      "topTouchEnd" === eventTopLevelType ||
-      "topTouchCancel" === eventTopLevelType
-    ) {
-      var JSCompiler_temp = [];
-      for (var i = 0; i < changedIndices.length; i++) {
-        var index = changedIndices[i];
-        JSCompiler_temp.push(touches[index]);
-        touches[index] = null;
-      }
-      for (i = changedIndices = 0; i < touches.length; i++)
-        (index = touches[i]),
-          null !== index && (touches[changedIndices++] = index);
-      touches.length = changedIndices;
-    } else
-      for (JSCompiler_temp = [], i = 0; i < changedIndices.length; i++)
-        JSCompiler_temp.push(touches[changedIndices[i]]);
-    for (
-      changedIndices = 0;
-      changedIndices < JSCompiler_temp.length;
-      changedIndices++
-    ) {
-      i = JSCompiler_temp[changedIndices];
-      i.changedTouches = JSCompiler_temp;
-      i.touches = touches;
-      index = null;
-      var target = i.target;
-      null === target ||
-        void 0 === target ||
-        target < ReactNativeTagHandles.tagsStartAt ||
-        (index = target);
-      _receiveRootNodeIDEvent(index, eventTopLevelType, i);
-    }
+  getClosestInstanceFromNode: getInstanceFromTag,
+  getInstanceFromNode: getInstanceFromTag,
+  getNodeFromInstance: function(inst) {
+    var tag = inst.stateNode._nativeTag;
+    void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
+    invariant(tag, "All native instances should have a tag.");
+    return tag;
+  },
+  getFiberCurrentPropsFromNode: function(stateNode) {
+    return instanceProps[stateNode._nativeTag] || null;
+  },
+  updateFiberProps: function(tag, props) {
+    instanceProps[tag] = props;
   }
 });
-RCTEventEmitter.register(ReactNativeEventEmitter);
 injection.injectEventPluginOrder([
   "ResponderEventPlugin",
   "ReactNativeBridgeEventPlugin"
@@ -1172,6 +945,9 @@ var hasSymbol = "function" === typeof Symbol && Symbol["for"],
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 60110,
   REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol["for"]("react.async_mode") : 60111,
+  REACT_FORWARD_REF_TYPE = hasSymbol
+    ? Symbol["for"]("react.forward_ref")
+    : 60112,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
   if (null === maybeIterable || "undefined" === typeof maybeIterable)
@@ -1192,7 +968,24 @@ function createPortal(children, containerInfo, implementation) {
     implementation: implementation
   };
 }
-var TouchHistoryMath = {
+var restoreTarget = null,
+  restoreQueue = null;
+function restoreStateOfTarget(target) {
+  if ((target = getInstanceFromNode(target))) {
+    invariant(
+      null,
+      "Fiber needs to be injected to handle a fiber target for controlled events. This error is likely caused by a bug in React. Please file an issue."
+    );
+    var props = getFiberCurrentPropsFromNode(target.stateNode);
+    null.restoreControlledState(target.stateNode, target.type, props);
+  }
+}
+function _batchedUpdates(fn, bookkeeping) {
+  return fn(bookkeeping);
+}
+function _flushInteractiveUpdates() {}
+var isBatching = !1,
+  TouchHistoryMath = {
     centroidDimension: function(
       touchHistory,
       touchesChangedAfter,
@@ -1293,12 +1086,6 @@ var TouchHistoryMath = {
     },
     noCentroid: -1
   },
-  ReactCurrentOwner =
-    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,
-  ReactGlobalSharedState = Object.freeze({
-    ReactCurrentOwner: ReactCurrentOwner,
-    ReactDebugCurrentFrame: null
-  }),
   objects = {},
   uniqueID = 1,
   emptyObject$2 = {},
@@ -1560,6 +1347,8 @@ function mountSafeCallback(context, callback) {
     }
   };
 }
+var ReactCurrentOwner =
+  React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner;
 function getComponentName(fiber) {
   fiber = fiber.type;
   if ("function" === typeof fiber) return fiber.displayName || fiber.name;
@@ -1705,7 +1494,8 @@ var ReactNativeComponent = (function(_React$Component) {
   frameDeadlineObject = {
     timeRemaining: function() {
       return frameDeadline - now();
-    }
+    },
+    didTimeout: !1
   };
 function setTimeoutCallback() {
   frameDeadline = now() + 5;
@@ -1844,103 +1634,6 @@ function findCurrentHostFiberWithNoPortals(parent) {
   }
   return null;
 }
-var valueStack = [],
-  index = -1;
-function pop(cursor) {
-  0 > index ||
-    ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
-}
-function push(cursor, value) {
-  index++;
-  valueStack[index] = cursor.current;
-  cursor.current = value;
-}
-new Set();
-var contextStackCursor = { current: emptyObject },
-  didPerformWorkStackCursor = { current: !1 },
-  previousContext = emptyObject;
-function getUnmaskedContext(workInProgress) {
-  return isContextProvider(workInProgress)
-    ? previousContext
-    : contextStackCursor.current;
-}
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var contextTypes = workInProgress.type.contextTypes;
-  if (!contextTypes) return emptyObject;
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  )
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  var context = {},
-    key;
-  for (key in contextTypes) context[key] = unmaskedContext[key];
-  instance &&
-    ((workInProgress = workInProgress.stateNode),
-    (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-    (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
-  return context;
-}
-function isContextProvider(fiber) {
-  return 2 === fiber.tag && null != fiber.type.childContextTypes;
-}
-function popContextProvider(fiber) {
-  isContextProvider(fiber) &&
-    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
-}
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    null == contextStackCursor.cursor,
-    "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-  );
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
-}
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode,
-    childContextTypes = fiber.type.childContextTypes;
-  if ("function" !== typeof instance.getChildContext) return parentContext;
-  instance = instance.getChildContext();
-  for (var contextKey in instance)
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
-  return Object.assign({}, parentContext, instance);
-}
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) return !1;
-  var instance = workInProgress.stateNode;
-  instance =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, instance, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
-  return !0;
-}
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-  );
-  if (didChange) {
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    push(contextStackCursor, mergedContext, workInProgress);
-  } else pop(didPerformWorkStackCursor, workInProgress);
-  push(didPerformWorkStackCursor, didChange, workInProgress);
-}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -2024,6 +1717,9 @@ function createFiberFromElement(element, mode, expirationTime) {
             case REACT_CONTEXT_TYPE:
               fiberTag = 12;
               break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = 14;
+              break;
             default:
               if ("number" === typeof type.tag)
                 return (
@@ -2104,6 +1800,40 @@ function onCommitRoot(root) {
 function onCommitUnmount(fiber) {
   "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
 }
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  do {
+    a: switch (workInProgress.tag) {
+      case 0:
+      case 1:
+      case 2:
+      case 5:
+        var owner = workInProgress._debugOwner,
+          source = workInProgress._debugSource;
+        var JSCompiler_inline_result = getComponentName(workInProgress);
+        var ownerName = null;
+        owner && (ownerName = getComponentName(owner));
+        owner = source;
+        JSCompiler_inline_result =
+          "\n    in " +
+          (JSCompiler_inline_result || "Unknown") +
+          (owner
+            ? " (at " +
+              owner.fileName.replace(/^.*[\\\/]/, "") +
+              ":" +
+              owner.lineNumber +
+              ")"
+            : ownerName ? " (created by " + ownerName + ")" : "");
+        break a;
+      default:
+        JSCompiler_inline_result = "";
+    }
+    info += JSCompiler_inline_result;
+    workInProgress = workInProgress["return"];
+  } while (workInProgress);
+  return info;
+}
+new Set();
 function createUpdateQueue(baseState) {
   return {
     baseState: baseState,
@@ -2112,7 +1842,8 @@ function createUpdateQueue(baseState) {
     last: null,
     callbackList: null,
     hasForceUpdate: !1,
-    isInitialized: !1
+    isInitialized: !1,
+    capturedValues: null
   };
 }
 function insertUpdateIntoQueue(queue, update) {
@@ -2125,7 +1856,10 @@ function insertUpdateIntoQueue(queue, update) {
   )
     queue.expirationTime = update.expirationTime;
 }
-function insertUpdateIntoFiber(fiber, update) {
+var q1 = void 0,
+  q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
   var alternateFiber = fiber.alternate,
     queue1 = fiber.updateQueue;
   null === queue1 && (queue1 = fiber.updateQueue = createUpdateQueue(null));
@@ -2134,13 +1868,19 @@ function insertUpdateIntoFiber(fiber, update) {
       null === fiber &&
         (fiber = alternateFiber.updateQueue = createUpdateQueue(null)))
     : (fiber = null);
-  fiber = fiber !== queue1 ? fiber : null;
-  null === fiber
-    ? insertUpdateIntoQueue(queue1, update)
-    : null === queue1.last || null === fiber.last
-      ? (insertUpdateIntoQueue(queue1, update),
-        insertUpdateIntoQueue(fiber, update))
-      : (insertUpdateIntoQueue(queue1, update), (fiber.last = update));
+  q1 = queue1;
+  q2 = fiber !== queue1 ? fiber : null;
+}
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  fiber = q1;
+  var queue2 = q2;
+  null === queue2
+    ? insertUpdateIntoQueue(fiber, update)
+    : null === fiber.last || null === queue2.last
+      ? (insertUpdateIntoQueue(fiber, update),
+        insertUpdateIntoQueue(queue2, update))
+      : (insertUpdateIntoQueue(fiber, update), (queue2.last = update));
 }
 function getStateFromUpdate(update, instance, prevState, props) {
   update = update.partialState;
@@ -2164,6 +1904,7 @@ function processUpdateQueue(
       first: queue.first,
       last: queue.last,
       isInitialized: queue.isInitialized,
+      capturedValues: queue.capturedValues,
       callbackList: null,
       hasForceUpdate: !1
     });
@@ -2211,6 +1952,11 @@ function processUpdateQueue(
         null === updateExpirationTime &&
           (updateExpirationTime = queue.callbackList = []),
         updateExpirationTime.push(update));
+      null !== update.capturedValue &&
+        ((updateExpirationTime = queue.capturedValues),
+        null === updateExpirationTime
+          ? (queue.capturedValues = [update.capturedValue])
+          : updateExpirationTime.push(update.capturedValue));
     }
     update = update.next;
   }
@@ -2218,6 +1964,7 @@ function processUpdateQueue(
     ? (workInProgress.effectTag |= 32)
     : null !== queue.first ||
       queue.hasForceUpdate ||
+      null !== queue.capturedValues ||
       (workInProgress.updateQueue = null);
   didSkip || (queue.baseState = current);
   return current;
@@ -2242,81 +1989,128 @@ function commitCallbacks(queue, context) {
     }
 }
 function ReactFiberClassComponent(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
   memoizeState
 ) {
+  function checkShouldComponentUpdate(
+    workInProgress,
+    oldProps,
+    newProps,
+    oldState,
+    newState,
+    newContext
+  ) {
+    if (
+      null === oldProps ||
+      (null !== workInProgress.updateQueue &&
+        workInProgress.updateQueue.hasForceUpdate)
+    )
+      return !0;
+    var instance = workInProgress.stateNode;
+    workInProgress = workInProgress.type;
+    return "function" === typeof instance.shouldComponentUpdate
+      ? instance.shouldComponentUpdate(newProps, newState, newContext)
+      : workInProgress.prototype &&
+        workInProgress.prototype.isPureReactComponent
+        ? !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
+        : !0;
+  }
   function adoptClassInstance(workInProgress, instance) {
     instance.updater = updater;
     workInProgress.stateNode = instance;
     instance._reactInternalFiber = workInProgress;
   }
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
-    instance = workInProgress.type;
-    if ("function" === typeof instance.getDerivedStateFromProps)
-      return instance.getDerivedStateFromProps.call(
+  function callComponentWillReceiveProps(
+    workInProgress,
+    instance,
+    newProps,
+    newContext
+  ) {
+    workInProgress = instance.state;
+    "function" === typeof instance.componentWillReceiveProps &&
+      instance.componentWillReceiveProps(newProps, newContext);
+    "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
+      instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.state !== workInProgress &&
+      updater.enqueueReplaceState(instance, instance.state, null);
+  }
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
+    workInProgress = workInProgress.type;
+    if ("function" === typeof workInProgress.getDerivedStateFromProps)
+      return workInProgress.getDerivedStateFromProps.call(
         null,
-        props,
-        workInProgress.memoizedState
+        nextProps,
+        prevState
       );
   }
-  var updater = {
-    isMounted: isMounted,
-    enqueueSetState: function(instance, partialState, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: partialState,
-        callback: callback,
-        isReplace: !1,
-        isForced: !1,
-        nextCallback: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueReplaceState: function(instance, state, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: state,
-        callback: callback,
-        isReplace: !0,
-        isForced: !1,
-        nextCallback: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueForceUpdate: function(instance, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: null,
-        callback: callback,
-        isReplace: !1,
-        isForced: !0,
-        nextCallback: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    }
-  };
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged,
+    updater = {
+      isMounted: isMounted,
+      enqueueSetState: function(instance, partialState, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: partialState,
+          callback: callback,
+          isReplace: !1,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueReplaceState: function(instance, state, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: state,
+          callback: callback,
+          isReplace: !0,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueForceUpdate: function(instance, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: null,
+          callback: callback,
+          isReplace: !1,
+          isForced: !0,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      }
+    };
   return {
     adoptClassInstance: adoptClassInstance,
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: function(workInProgress, props) {
       var ctor = workInProgress.type,
         unmaskedContext = getUnmaskedContext(workInProgress),
-        needsContext =
-          2 === workInProgress.tag && null != workInProgress.type.contextTypes,
+        needsContext = isContextConsumer(workInProgress),
         context = needsContext
           ? getMaskedContext(workInProgress, unmaskedContext)
           : emptyObject;
@@ -2325,7 +2119,7 @@ function ReactFiberClassComponent(
         null !== ctor.state && void 0 !== ctor.state ? ctor.state : null;
       adoptClassInstance(workInProgress, ctor);
       workInProgress.memoizedState = state;
-      props = callGetDerivedStateFromProps(workInProgress, ctor, props);
+      props = callGetDerivedStateFromProps(workInProgress, ctor, props, state);
       null !== props &&
         void 0 !== props &&
         (workInProgress.memoizedState = Object.assign(
@@ -2333,14 +2127,12 @@ function ReactFiberClassComponent(
           workInProgress.memoizedState,
           props
         ));
-      needsContext &&
-        ((workInProgress = workInProgress.stateNode),
-        (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-        (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
+      needsContext && cacheContext(workInProgress, unmaskedContext, context);
       return ctor;
     },
     mountClassInstance: function(workInProgress, renderExpirationTime) {
-      var current = workInProgress.alternate,
+      var ctor = workInProgress.type,
+        current = workInProgress.alternate,
         instance = workInProgress.stateNode,
         props = workInProgress.pendingProps,
         unmaskedContext = getUnmaskedContext(workInProgress);
@@ -2348,22 +2140,23 @@ function ReactFiberClassComponent(
       instance.state = workInProgress.memoizedState;
       instance.refs = emptyObject;
       instance.context = getMaskedContext(workInProgress, unmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillMount &&
-        "function" !== typeof instance.componentWillMount) ||
-        "function" === typeof workInProgress.type.getDerivedStateFromProps ||
-        ((unmaskedContext = instance.state),
+      "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate ||
+        ("function" !== typeof instance.UNSAFE_componentWillMount &&
+          "function" !== typeof instance.componentWillMount) ||
+        ((ctor = instance.state),
         "function" === typeof instance.componentWillMount &&
           instance.componentWillMount(),
         "function" === typeof instance.UNSAFE_componentWillMount &&
           instance.UNSAFE_componentWillMount(),
-        unmaskedContext !== instance.state &&
+        ctor !== instance.state &&
           updater.enqueueReplaceState(instance, instance.state, null),
-        (unmaskedContext = workInProgress.updateQueue),
-        null !== unmaskedContext &&
+        (ctor = workInProgress.updateQueue),
+        null !== ctor &&
           (instance.state = processUpdateQueue(
             current,
             workInProgress,
-            unmaskedContext,
+            ctor,
             instance,
             props,
             renderExpirationTime
@@ -2371,12 +2164,108 @@ function ReactFiberClassComponent(
       "function" === typeof instance.componentDidMount &&
         (workInProgress.effectTag |= 4);
     },
+    resumeMountClassInstance: function(workInProgress, renderExpirationTime) {
+      var ctor = workInProgress.type,
+        instance = workInProgress.stateNode;
+      instance.props = workInProgress.memoizedProps;
+      instance.state = workInProgress.memoizedState;
+      var oldProps = workInProgress.memoizedProps,
+        newProps = workInProgress.pendingProps,
+        oldContext = instance.context,
+        newUnmaskedContext = getUnmaskedContext(workInProgress);
+      newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
+      (ctor =
+        "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate) ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
+        ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            instance,
+            newProps,
+            newUnmaskedContext
+          ));
+      oldContext = workInProgress.memoizedState;
+      renderExpirationTime =
+        null !== workInProgress.updateQueue
+          ? processUpdateQueue(
+              null,
+              workInProgress,
+              workInProgress.updateQueue,
+              instance,
+              newProps,
+              renderExpirationTime
+            )
+          : oldContext;
+      var derivedStateFromProps = void 0;
+      oldProps !== newProps &&
+        (derivedStateFromProps = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      if (null !== derivedStateFromProps && void 0 !== derivedStateFromProps) {
+        renderExpirationTime =
+          null === renderExpirationTime || void 0 === renderExpirationTime
+            ? derivedStateFromProps
+            : Object.assign({}, renderExpirationTime, derivedStateFromProps);
+        var _updateQueue = workInProgress.updateQueue;
+        null !== _updateQueue &&
+          (_updateQueue.baseState = Object.assign(
+            {},
+            _updateQueue.baseState,
+            derivedStateFromProps
+          ));
+      }
+      if (
+        !(
+          oldProps !== newProps ||
+          oldContext !== renderExpirationTime ||
+          hasContextChanged() ||
+          (null !== workInProgress.updateQueue &&
+            workInProgress.updateQueue.hasForceUpdate)
+        )
+      )
+        return (
+          "function" === typeof instance.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          !1
+        );
+      (oldProps = checkShouldComponentUpdate(
+        workInProgress,
+        oldProps,
+        newProps,
+        oldContext,
+        renderExpirationTime,
+        newUnmaskedContext
+      ))
+        ? (ctor ||
+            ("function" !== typeof instance.UNSAFE_componentWillMount &&
+              "function" !== typeof instance.componentWillMount) ||
+            ("function" === typeof instance.componentWillMount &&
+              instance.componentWillMount(),
+            "function" === typeof instance.UNSAFE_componentWillMount &&
+              instance.UNSAFE_componentWillMount()),
+          "function" === typeof instance.componentDidMount &&
+            (workInProgress.effectTag |= 4))
+        : ("function" === typeof instance.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          memoizeProps(workInProgress, newProps),
+          memoizeState(workInProgress, renderExpirationTime));
+      instance.props = newProps;
+      instance.state = renderExpirationTime;
+      instance.context = newUnmaskedContext;
+      return oldProps;
+    },
     updateClassInstance: function(
       current,
       workInProgress,
       renderExpirationTime
     ) {
-      var instance = workInProgress.stateNode;
+      var ctor = workInProgress.type,
+        instance = workInProgress.stateNode;
       instance.props = workInProgress.memoizedProps;
       instance.state = workInProgress.memoizedState;
       var oldProps = workInProgress.memoizedProps,
@@ -2384,27 +2273,18 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-        "function" !== typeof instance.componentWillReceiveProps) ||
-        "function" === typeof workInProgress.type.getDerivedStateFromProps ||
-        (oldProps === newProps && oldContext === newUnmaskedContext) ||
-        ((oldContext = instance.state),
-        "function" === typeof instance.componentWillReceiveProps &&
-          instance.componentWillReceiveProps(newProps, newUnmaskedContext),
-        "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
-          instance.UNSAFE_componentWillReceiveProps(
+      (ctor =
+        "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate) ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
+        ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            instance,
             newProps,
             newUnmaskedContext
-          ),
-        instance.state !== oldContext &&
-          updater.enqueueReplaceState(instance, instance.state, null));
-      var partialState = void 0;
-      oldProps !== newProps &&
-        (partialState = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps
-        ));
+          ));
       oldContext = workInProgress.memoizedState;
       renderExpirationTime =
         null !== workInProgress.updateQueue
@@ -2417,17 +2297,32 @@ function ReactFiberClassComponent(
               renderExpirationTime
             )
           : oldContext;
-      null !== partialState &&
-        void 0 !== partialState &&
-        (renderExpirationTime =
+      var derivedStateFromProps = void 0;
+      oldProps !== newProps &&
+        (derivedStateFromProps = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      if (null !== derivedStateFromProps && void 0 !== derivedStateFromProps) {
+        renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? partialState
-            : Object.assign({}, renderExpirationTime, partialState));
+            ? derivedStateFromProps
+            : Object.assign({}, renderExpirationTime, derivedStateFromProps);
+        var _updateQueue3 = workInProgress.updateQueue;
+        null !== _updateQueue3 &&
+          (_updateQueue3.baseState = Object.assign(
+            {},
+            _updateQueue3.baseState,
+            derivedStateFromProps
+          ));
+      }
       if (
         !(
           oldProps !== newProps ||
           oldContext !== renderExpirationTime ||
-          didPerformWorkStackCursor.current ||
+          hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2437,35 +2332,23 @@ function ReactFiberClassComponent(
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           !1
         );
-      partialState = renderExpirationTime;
-      if (
-        null === oldProps ||
-        (null !== workInProgress.updateQueue &&
-          workInProgress.updateQueue.hasForceUpdate)
-      )
-        partialState = !0;
-      else {
-        var instance$jscomp$0 = workInProgress.stateNode,
-          type = workInProgress.type;
-        partialState =
-          "function" === typeof instance$jscomp$0.shouldComponentUpdate
-            ? instance$jscomp$0.shouldComponentUpdate(
-                newProps,
-                partialState,
-                newUnmaskedContext
-              )
-            : type.prototype && type.prototype.isPureReactComponent
-              ? !shallowEqual(oldProps, newProps) ||
-                !shallowEqual(oldContext, partialState)
-              : !0;
-      }
-      partialState
-        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-            "function" !== typeof instance.componentWillUpdate) ||
-            "function" ===
-              typeof workInProgress.type.getDerivedStateFromProps ||
+      (derivedStateFromProps = checkShouldComponentUpdate(
+        workInProgress,
+        oldProps,
+        newProps,
+        oldContext,
+        renderExpirationTime,
+        newUnmaskedContext
+      ))
+        ? (ctor ||
+            ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+              "function" !== typeof instance.componentWillUpdate) ||
             ("function" === typeof instance.componentWillUpdate &&
               instance.componentWillUpdate(
                 newProps,
@@ -2479,17 +2362,23 @@ function ReactFiberClassComponent(
                 newUnmaskedContext
               )),
           "function" === typeof instance.componentDidUpdate &&
-            (workInProgress.effectTag |= 4))
+            (workInProgress.effectTag |= 4),
+          "function" === typeof instance.getSnapshotBeforeUpdate &&
+            (workInProgress.effectTag |= 2048))
         : ("function" !== typeof instance.componentDidUpdate ||
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           memoizeProps(workInProgress, newProps),
           memoizeState(workInProgress, renderExpirationTime));
       instance.props = newProps;
       instance.state = renderExpirationTime;
       instance.context = newUnmaskedContext;
-      return partialState;
+      return derivedStateFromProps;
     }
   };
 }
@@ -3166,41 +3055,31 @@ function ChildReconciler(shouldTrackSideEffects) {
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
-  mountChildFibers = ChildReconciler(!1),
-  changedBitsStack = [],
-  currentValueStack = [],
-  stack = [],
-  index$1 = -1;
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context.changedBits;
-  currentValueStack[index$1] = context.currentValue;
-  stack[index$1] = providerFiber;
-  context.currentValue = providerFiber.pendingProps.value;
-  context.changedBits = providerFiber.stateNode;
-}
-function popProvider(providerFiber) {
-  var changedBits = changedBitsStack[index$1],
-    currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  --index$1;
-  providerFiber = providerFiber.type.context;
-  providerFiber.currentValue = currentValue;
-  providerFiber.changedBits = changedBits;
-}
+  mountChildFibers = ChildReconciler(!1);
 function ReactFiberBeginWork(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
 ) {
   function reconcileChildren(current, workInProgress, nextChildren) {
-    var renderExpirationTime = workInProgress.expirationTime;
-    workInProgress.child =
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      workInProgress.expirationTime
+    );
+  }
+  function reconcileChildrenAtExpirationTime(
+    current,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  ) {
+    workInProgress.child =
       null === current
         ? mountChildFibers(
             workInProgress,
@@ -3227,19 +3106,34 @@ function ReactFiberBeginWork(
     current,
     workInProgress,
     shouldUpdate,
-    hasContext
+    hasContext,
+    didCaptureError,
+    renderExpirationTime
   ) {
     markRef(current, workInProgress);
-    if (!shouldUpdate)
+    if (!shouldUpdate && !didCaptureError)
       return (
         hasContext && invalidateContextProvider(workInProgress, !1),
         bailoutOnAlreadyFinishedWork(current, workInProgress)
       );
     shouldUpdate = workInProgress.stateNode;
     ReactCurrentOwner.current = workInProgress;
-    var nextChildren = shouldUpdate.render();
+    var nextChildren = didCaptureError ? null : shouldUpdate.render();
     workInProgress.effectTag |= 1;
-    reconcileChildren(current, workInProgress, nextChildren);
+    didCaptureError &&
+      (reconcileChildrenAtExpirationTime(
+        current,
+        workInProgress,
+        null,
+        renderExpirationTime
+      ),
+      (workInProgress.child = null));
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
     workInProgress.memoizedState = shouldUpdate.state;
     workInProgress.memoizedProps = shouldUpdate.props;
     hasContext && invalidateContextProvider(workInProgress, !0);
@@ -3263,7 +3157,12 @@ function ReactFiberBeginWork(
     changedBits,
     renderExpirationTime
   ) {
-    for (var fiber = workInProgress.child; null !== fiber; ) {
+    var fiber = workInProgress.child;
+    for (
+      null !== fiber && (fiber["return"] = workInProgress);
+      null !== fiber;
+
+    ) {
       switch (fiber.tag) {
         case 12:
           var nextFiber = fiber.stateNode | 0;
@@ -3314,6 +3213,72 @@ function ReactFiberBeginWork(
       fiber = nextFiber;
     }
   }
+  function updateContextProvider(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    var context = workInProgress.type._context,
+      newProps = workInProgress.pendingProps,
+      oldProps = workInProgress.memoizedProps;
+    if (!hasLegacyContextChanged() && oldProps === newProps)
+      return (
+        (workInProgress.stateNode = 0),
+        pushProvider(workInProgress),
+        bailoutOnAlreadyFinishedWork(current, workInProgress)
+      );
+    var newValue = newProps.value;
+    workInProgress.memoizedProps = newProps;
+    if (null === oldProps) newValue = 1073741823;
+    else if (oldProps.value === newProps.value) {
+      if (oldProps.children === newProps.children)
+        return (
+          (workInProgress.stateNode = 0),
+          pushProvider(workInProgress),
+          bailoutOnAlreadyFinishedWork(current, workInProgress)
+        );
+      newValue = 0;
+    } else {
+      var oldValue = oldProps.value;
+      if (
+        (oldValue === newValue &&
+          (0 !== oldValue || 1 / oldValue === 1 / newValue)) ||
+        (oldValue !== oldValue && newValue !== newValue)
+      ) {
+        if (oldProps.children === newProps.children)
+          return (
+            (workInProgress.stateNode = 0),
+            pushProvider(workInProgress),
+            bailoutOnAlreadyFinishedWork(current, workInProgress)
+          );
+        newValue = 0;
+      } else if (
+        ((newValue =
+          "function" === typeof context._calculateChangedBits
+            ? context._calculateChangedBits(oldValue, newValue)
+            : 1073741823),
+        (newValue |= 0),
+        0 === newValue)
+      ) {
+        if (oldProps.children === newProps.children)
+          return (
+            (workInProgress.stateNode = 0),
+            pushProvider(workInProgress),
+            bailoutOnAlreadyFinishedWork(current, workInProgress)
+          );
+      } else
+        propagateContextChange(
+          workInProgress,
+          context,
+          newValue,
+          renderExpirationTime
+        );
+    }
+    workInProgress.stateNode = newValue;
+    pushProvider(workInProgress);
+    reconcileChildren(current, workInProgress, newProps.children);
+    return workInProgress.child;
+  }
   function bailoutOnAlreadyFinishedWork(current, workInProgress) {
     invariant(
       null === current || workInProgress.child === current.child,
@@ -3339,34 +3304,23 @@ function ReactFiberBeginWork(
     }
     return workInProgress.child;
   }
-  function bailoutOnLowPriority(current, workInProgress) {
-    switch (workInProgress.tag) {
-      case 3:
-        pushHostRootContext(workInProgress);
-        break;
-      case 2:
-        pushContextProvider(workInProgress);
-        break;
-      case 4:
-        pushHostContainer(
-          workInProgress,
-          workInProgress.stateNode.containerInfo
-        );
-        break;
-      case 13:
-        pushProvider(workInProgress);
-    }
-    return null;
-  }
   var shouldSetTextContent = config.shouldSetTextContent,
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree,
     pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer,
+    pushProvider = newContext.pushProvider,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider,
     enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
   config = ReactFiberClassComponent(
+    legacyContext,
     scheduleWork,
     computeExpirationForFiber,
     function(workInProgress, nextProps) {
@@ -3380,14 +3334,32 @@ function ReactFiberBeginWork(
     callGetDerivedStateFromProps = config.callGetDerivedStateFromProps,
     constructClassInstance = config.constructClassInstance,
     mountClassInstance = config.mountClassInstance,
+    resumeMountClassInstance = config.resumeMountClassInstance,
     updateClassInstance = config.updateClassInstance;
   return {
     beginWork: function(current, workInProgress, renderExpirationTime) {
       if (
         0 === workInProgress.expirationTime ||
         workInProgress.expirationTime > renderExpirationTime
-      )
-        return bailoutOnLowPriority(current, workInProgress);
+      ) {
+        switch (workInProgress.tag) {
+          case 3:
+            pushHostRootContext(workInProgress);
+            break;
+          case 2:
+            pushLegacyContextProvider(workInProgress);
+            break;
+          case 4:
+            pushHostContainer(
+              workInProgress,
+              workInProgress.stateNode.containerInfo
+            );
+            break;
+          case 13:
+            pushProvider(workInProgress);
+        }
+        return null;
+      }
       switch (workInProgress.tag) {
         case 0:
           invariant(
@@ -3412,7 +3384,8 @@ function ReactFiberBeginWork(
                 ((props = callGetDerivedStateFromProps(
                   workInProgress,
                   fn,
-                  props
+                  props,
+                  workInProgress.memoizedState
                 )),
                 null !== props &&
                   void 0 !== props &&
@@ -3421,14 +3394,16 @@ function ReactFiberBeginWork(
                     workInProgress.memoizedState,
                     props
                   ))),
-              (props = pushContextProvider(workInProgress)),
+              (props = pushLegacyContextProvider(workInProgress)),
               adoptClassInstance(workInProgress, fn),
               mountClassInstance(workInProgress, renderExpirationTime),
               (current = finishClassComponent(
                 current,
                 workInProgress,
                 !0,
-                props
+                props,
+                !1,
+                renderExpirationTime
               )))
             : ((workInProgress.tag = 1),
               reconcileChildren(current, workInProgress, fn),
@@ -3439,7 +3414,7 @@ function ReactFiberBeginWork(
           return (
             (props = workInProgress.type),
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? ((fn = getUnmaskedContext(workInProgress)),
                 (fn = getMaskedContext(workInProgress, fn)),
@@ -3455,92 +3430,117 @@ function ReactFiberBeginWork(
             current
           );
         case 2:
-          return (
-            (props = pushContextProvider(workInProgress)),
-            (fn = void 0),
-            null === current
-              ? workInProgress.stateNode
-                ? invariant(!1, "Resuming work not yet implemented.")
-                : (constructClassInstance(
-                    workInProgress,
-                    workInProgress.pendingProps
-                  ),
-                  mountClassInstance(workInProgress, renderExpirationTime),
-                  (fn = !0))
-              : (fn = updateClassInstance(
-                  current,
+          props = pushLegacyContextProvider(workInProgress);
+          null === current
+            ? null === workInProgress.stateNode
+              ? (constructClassInstance(
+                  workInProgress,
+                  workInProgress.pendingProps
+                ),
+                mountClassInstance(workInProgress, renderExpirationTime),
+                (fn = !0))
+              : (fn = resumeMountClassInstance(
                   workInProgress,
                   renderExpirationTime
-                )),
-            finishClassComponent(current, workInProgress, fn, props)
+                ))
+            : (fn = updateClassInstance(
+                current,
+                workInProgress,
+                renderExpirationTime
+              ));
+          unmaskedContext = !1;
+          var updateQueue = workInProgress.updateQueue;
+          null !== updateQueue &&
+            null !== updateQueue.capturedValues &&
+            (unmaskedContext = fn = !0);
+          return finishClassComponent(
+            current,
+            workInProgress,
+            fn,
+            props,
+            unmaskedContext,
+            renderExpirationTime
           );
         case 3:
-          return (
-            pushHostRootContext(workInProgress),
-            (props = workInProgress.updateQueue),
-            null !== props
-              ? ((fn = workInProgress.memoizedState),
-                (props = processUpdateQueue(
-                  current,
+          a: if (
+            (pushHostRootContext(workInProgress),
+            (fn = workInProgress.updateQueue),
+            null !== fn)
+          ) {
+            unmaskedContext = workInProgress.memoizedState;
+            props = processUpdateQueue(
+              current,
+              workInProgress,
+              fn,
+              null,
+              null,
+              renderExpirationTime
+            );
+            workInProgress.memoizedState = props;
+            fn = workInProgress.updateQueue;
+            if (null !== fn && null !== fn.capturedValues) fn = null;
+            else if (unmaskedContext === props) {
+              resetHydrationState();
+              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+              break a;
+            } else fn = props.element;
+            unmaskedContext = workInProgress.stateNode;
+            (null === current || null === current.child) &&
+            unmaskedContext.hydrate &&
+            enterHydrationState(workInProgress)
+              ? ((workInProgress.effectTag |= 2),
+                (workInProgress.child = mountChildFibers(
                   workInProgress,
-                  props,
-                  null,
                   null,
+                  fn,
                   renderExpirationTime
-                )),
-                fn === props
-                  ? (resetHydrationState(),
-                    (current = bailoutOnAlreadyFinishedWork(
-                      current,
-                      workInProgress
-                    )))
-                  : ((fn = props.element),
-                    (unmaskedContext = workInProgress.stateNode),
-                    (null === current || null === current.child) &&
-                    unmaskedContext.hydrate &&
-                    enterHydrationState(workInProgress)
-                      ? ((workInProgress.effectTag |= 2),
-                        (workInProgress.child = mountChildFibers(
-                          workInProgress,
-                          null,
-                          fn,
-                          renderExpirationTime
-                        )))
-                      : (resetHydrationState(),
-                        reconcileChildren(current, workInProgress, fn)),
-                    (workInProgress.memoizedState = props),
-                    (current = workInProgress.child)))
+                )))
               : (resetHydrationState(),
-                (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))),
-            current
-          );
+                reconcileChildren(current, workInProgress, fn));
+            workInProgress.memoizedState = props;
+            current = workInProgress.child;
+          } else
+            resetHydrationState(),
+              (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
+          return current;
         case 5:
-          pushHostContext(workInProgress);
-          null === current && tryToClaimNextHydratableInstance(workInProgress);
-          props = workInProgress.type;
-          var memoizedProps = workInProgress.memoizedProps;
-          fn = workInProgress.pendingProps;
-          unmaskedContext = null !== current ? current.memoizedProps : null;
-          didPerformWorkStackCursor.current || memoizedProps !== fn
-            ? ((memoizedProps = fn.children),
-              shouldSetTextContent(props, fn)
-                ? (memoizedProps = null)
-                : unmaskedContext &&
-                  shouldSetTextContent(props, unmaskedContext) &&
-                  (workInProgress.effectTag |= 16),
-              markRef(current, workInProgress),
-              1073741823 !== renderExpirationTime &&
-              workInProgress.mode & 1 &&
-              shouldDeprioritizeSubtree(props, fn)
-                ? ((workInProgress.expirationTime = 1073741823),
-                  (current = null))
-                : (reconcileChildren(current, workInProgress, memoizedProps),
-                  (workInProgress.memoizedProps = fn),
-                  (current = workInProgress.child)))
-            : (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
+          a: {
+            pushHostContext(workInProgress);
+            null === current &&
+              tryToClaimNextHydratableInstance(workInProgress);
+            props = workInProgress.type;
+            updateQueue = workInProgress.memoizedProps;
+            fn = workInProgress.pendingProps;
+            unmaskedContext = null !== current ? current.memoizedProps : null;
+            if (!hasLegacyContextChanged() && updateQueue === fn) {
+              if (
+                (updateQueue =
+                  workInProgress.mode & 1 &&
+                  shouldDeprioritizeSubtree(props, fn))
+              )
+                workInProgress.expirationTime = 1073741823;
+              if (!updateQueue || 1073741823 !== renderExpirationTime) {
+                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+                break a;
+              }
+            }
+            updateQueue = fn.children;
+            shouldSetTextContent(props, fn)
+              ? (updateQueue = null)
+              : unmaskedContext &&
+                shouldSetTextContent(props, unmaskedContext) &&
+                (workInProgress.effectTag |= 16);
+            markRef(current, workInProgress);
+            1073741823 !== renderExpirationTime &&
+            workInProgress.mode & 1 &&
+            shouldDeprioritizeSubtree(props, fn)
+              ? ((workInProgress.expirationTime = 1073741823),
+                (workInProgress.memoizedProps = fn),
+                (current = null))
+              : (reconcileChildren(current, workInProgress, updateQueue),
+                (workInProgress.memoizedProps = fn),
+                (current = workInProgress.child));
+          }
           return current;
         case 6:
           return (
@@ -3554,7 +3554,7 @@ function ReactFiberBeginWork(
         case 7:
           return (
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
               workInProgress.memoizedProps !== props ||
               (props = workInProgress.memoizedProps),
             (fn = props.children),
@@ -3584,8 +3584,7 @@ function ReactFiberBeginWork(
               workInProgress.stateNode.containerInfo
             ),
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
-            workInProgress.memoizedProps !== props
+            hasLegacyContextChanged() || workInProgress.memoizedProps !== props
               ? (null === current
                   ? (workInProgress.child = reconcileChildFibers(
                       workInProgress,
@@ -3602,10 +3601,21 @@ function ReactFiberBeginWork(
                 )),
             current
           );
+        case 14:
+          return (
+            (renderExpirationTime = workInProgress.type.render),
+            (renderExpirationTime = renderExpirationTime(
+              workInProgress.pendingProps,
+              workInProgress.ref
+            )),
+            reconcileChildren(current, workInProgress, renderExpirationTime),
+            (workInProgress.memoizedProps = renderExpirationTime),
+            workInProgress.child
+          );
         case 10:
           return (
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? (reconcileChildren(
                   current,
@@ -3623,7 +3633,7 @@ function ReactFiberBeginWork(
         case 11:
           return (
             (renderExpirationTime = workInProgress.pendingProps.children),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             (null !== renderExpirationTime &&
               workInProgress.memoizedProps !== renderExpirationTime)
               ? (reconcileChildren(
@@ -3640,117 +3650,56 @@ function ReactFiberBeginWork(
             current
           );
         case 13:
-          props = workInProgress.type.context;
-          fn = workInProgress.pendingProps;
-          unmaskedContext = workInProgress.memoizedProps;
-          if (didPerformWorkStackCursor.current || unmaskedContext !== fn) {
-            workInProgress.memoizedProps = fn;
-            memoizedProps = fn.value;
-            if (null === unmaskedContext) memoizedProps = 1073741823;
-            else {
-              var oldValue = unmaskedContext.value;
-              (oldValue === memoizedProps &&
-                (0 !== oldValue || 1 / oldValue === 1 / memoizedProps)) ||
-              (oldValue !== oldValue && memoizedProps !== memoizedProps)
-                ? (memoizedProps = 0)
-                : ((memoizedProps =
-                    "function" === typeof props.calculateChangedBits
-                      ? props.calculateChangedBits(oldValue, memoizedProps)
-                      : 1073741823),
-                  (memoizedProps |= 0),
-                  0 !== memoizedProps &&
-                    propagateContextChange(
-                      workInProgress,
-                      props,
-                      memoizedProps,
-                      renderExpirationTime
-                    ));
-            }
-            workInProgress.stateNode = memoizedProps;
-            pushProvider(workInProgress);
-            null !== unmaskedContext && unmaskedContext.children === fn.children
-              ? (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))
-              : (reconcileChildren(current, workInProgress, fn.children),
-                (current = workInProgress.child));
+          return updateContextProvider(
+            current,
+            workInProgress,
+            renderExpirationTime
+          );
+        case 12:
+          fn = workInProgress.type;
+          unmaskedContext = workInProgress.pendingProps;
+          var oldProps = workInProgress.memoizedProps;
+          props = fn._currentValue;
+          updateQueue = fn._changedBits;
+          if (
+            hasLegacyContextChanged() ||
+            0 !== updateQueue ||
+            oldProps !== unmaskedContext
+          ) {
+            workInProgress.memoizedProps = unmaskedContext;
+            oldProps = unmaskedContext.unstable_observedBits;
+            if (void 0 === oldProps || null === oldProps) oldProps = 1073741823;
+            workInProgress.stateNode = oldProps;
+            0 !== (updateQueue & oldProps) &&
+              propagateContextChange(
+                workInProgress,
+                fn,
+                updateQueue,
+                renderExpirationTime
+              );
+            renderExpirationTime = unmaskedContext.children;
+            renderExpirationTime = renderExpirationTime(props);
+            reconcileChildren(current, workInProgress, renderExpirationTime);
+            current = workInProgress.child;
           } else
-            (workInProgress.stateNode = 0),
-              pushProvider(workInProgress),
-              (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
+            current = bailoutOnAlreadyFinishedWork(current, workInProgress);
           return current;
-        case 12:
-          unmaskedContext = workInProgress.type;
-          fn = workInProgress.pendingProps;
-          props = unmaskedContext.currentValue;
-          memoizedProps = unmaskedContext.changedBits;
-          0 !== memoizedProps &&
-            propagateContextChange(
-              workInProgress,
-              unmaskedContext,
-              memoizedProps,
-              renderExpirationTime
-            );
-          renderExpirationTime = fn.observedBits;
-          if (void 0 === renderExpirationTime || null === renderExpirationTime)
-            renderExpirationTime = 1073741823;
-          workInProgress.stateNode = renderExpirationTime;
-          renderExpirationTime = fn.children;
-          renderExpirationTime = renderExpirationTime(props);
-          reconcileChildren(current, workInProgress, renderExpirationTime);
-          return workInProgress.child;
         default:
           invariant(
             !1,
             "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
           );
       }
-    },
-    beginFailedWork: function(current, workInProgress, renderExpirationTime) {
-      switch (workInProgress.tag) {
-        case 2:
-          pushContextProvider(workInProgress);
-          break;
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        default:
-          invariant(
-            !1,
-            "Invalid type of work. This error is likely caused by a bug in React. Please file an issue."
-          );
-      }
-      workInProgress.effectTag |= 64;
-      null === current
-        ? (workInProgress.child = null)
-        : workInProgress.child !== current.child &&
-          (workInProgress.child = current.child);
-      if (
-        0 === workInProgress.expirationTime ||
-        workInProgress.expirationTime > renderExpirationTime
-      )
-        return bailoutOnLowPriority(current, workInProgress);
-      workInProgress.firstEffect = null;
-      workInProgress.lastEffect = null;
-      workInProgress.child =
-        null === current
-          ? mountChildFibers(workInProgress, null, null, renderExpirationTime)
-          : reconcileChildFibers(
-              workInProgress,
-              current.child,
-              null,
-              renderExpirationTime
-            );
-      2 === workInProgress.tag &&
-        ((current = workInProgress.stateNode),
-        (workInProgress.memoizedProps = current.props),
-        (workInProgress.memoizedState = current.state));
-      return workInProgress.child;
     }
   };
 }
-function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
+function ReactFiberCompleteWork(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   function markUpdate(workInProgress) {
     workInProgress.effectTag |= 4;
   }
@@ -3783,6 +3732,9 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider,
     prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -3803,30 +3755,26 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
       if (null !== workInProgress.firstEffect) {
         var container = portalOrRoot.containerInfo,
           newChildSet = createContainerChildSet(container);
-        finalizeContainerChildren(container, newChildSet) &&
-          markUpdate(workInProgress);
-        portalOrRoot.pendingChildren = newChildSet;
-        a: for (portalOrRoot = workInProgress.child; null !== portalOrRoot; ) {
-          if (5 === portalOrRoot.tag || 6 === portalOrRoot.tag)
-            appendChildToContainerChildSet(newChildSet, portalOrRoot.stateNode);
-          else if (4 !== portalOrRoot.tag && null !== portalOrRoot.child) {
-            portalOrRoot.child["return"] = portalOrRoot;
-            portalOrRoot = portalOrRoot.child;
+        a: for (var node = workInProgress.child; null !== node; ) {
+          if (5 === node.tag || 6 === node.tag)
+            appendChildToContainerChildSet(newChildSet, node.stateNode);
+          else if (4 !== node.tag && null !== node.child) {
+            node.child["return"] = node;
+            node = node.child;
             continue;
           }
-          if (portalOrRoot === workInProgress) break a;
-          for (; null === portalOrRoot.sibling; ) {
-            if (
-              null === portalOrRoot["return"] ||
-              portalOrRoot["return"] === workInProgress
-            )
+          if (node === workInProgress) break a;
+          for (; null === node.sibling; ) {
+            if (null === node["return"] || node["return"] === workInProgress)
               break a;
-            portalOrRoot = portalOrRoot["return"];
+            node = node["return"];
           }
-          portalOrRoot.sibling["return"] = portalOrRoot["return"];
-          portalOrRoot = portalOrRoot.sibling;
+          node.sibling["return"] = node["return"];
+          node = node.sibling;
         }
+        portalOrRoot.pendingChildren = newChildSet;
         markUpdate(workInProgress);
+        finalizeContainerChildren(container, newChildSet);
       }
     };
     updateHostComponent = function(
@@ -3885,11 +3833,21 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
         case 1:
           return null;
         case 2:
-          return popContextProvider(workInProgress), null;
+          return (
+            popLegacyContextProvider(workInProgress),
+            (current = workInProgress.stateNode),
+            (newProps = workInProgress.updateQueue),
+            null !== newProps &&
+              null !== newProps.capturedValues &&
+              ((workInProgress.effectTag &= -65),
+              "function" === typeof current.componentDidCatch
+                ? (workInProgress.effectTag |= 256)
+                : (newProps.capturedValues = null)),
+            null
+          );
         case 3:
           popHostContainer(workInProgress);
-          pop(didPerformWorkStackCursor, workInProgress);
-          pop(contextStackCursor, workInProgress);
+          popTopLevelLegacyContextObject(workInProgress);
           newProps = workInProgress.stateNode;
           newProps.pendingContext &&
             ((newProps.context = newProps.pendingContext),
@@ -3897,6 +3855,10 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           if (null === current || null === current.child)
             popHydrationState(workInProgress), (workInProgress.effectTag &= -3);
           updateHostContainer(workInProgress);
+          current = workInProgress.updateQueue;
+          null !== current &&
+            null !== current.capturedValues &&
+            (workInProgress.effectTag |= 256);
           return null;
         case 5:
           popHostContext(workInProgress);
@@ -3904,10 +3866,10 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           var type = workInProgress.type;
           if (null !== current && null != workInProgress.stateNode) {
             var oldProps = current.memoizedProps,
-              instance = workInProgress.stateNode,
+              _instance = workInProgress.stateNode,
               currentHostContext = getHostContext();
-            instance = prepareUpdate(
-              instance,
+            _instance = prepareUpdate(
+              _instance,
               type,
               oldProps,
               newProps,
@@ -3917,7 +3879,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
             updateHostComponent(
               current,
               workInProgress,
-              instance,
+              _instance,
               type,
               oldProps,
               newProps,
@@ -4037,6 +3999,8 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           return (workInProgress.tag = 7), null;
         case 9:
           return null;
+        case 14:
+          return null;
         case 10:
           return null;
         case 11:
@@ -4065,7 +4029,125 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
     }
   };
 }
-function ReactFiberCommitWork(config, captureError) {
+function ReactFiberUnwindWork(
+  hostContext,
+  legacyContext,
+  newContext,
+  scheduleWork,
+  isAlreadyFailedLegacyErrorBoundary
+) {
+  var popHostContainer = hostContext.popHostContainer,
+    popHostContext = hostContext.popHostContext,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider;
+  return {
+    throwException: function(returnFiber, sourceFiber, rawValue) {
+      sourceFiber.effectTag |= 512;
+      sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+      sourceFiber = {
+        value: rawValue,
+        source: sourceFiber,
+        stack: getStackAddendumByWorkInProgressFiber(sourceFiber)
+      };
+      do {
+        switch (returnFiber.tag) {
+          case 3:
+            ensureUpdateQueues(returnFiber);
+            returnFiber.updateQueue.capturedValues = [sourceFiber];
+            returnFiber.effectTag |= 1024;
+            return;
+          case 2:
+            if (
+              ((rawValue = returnFiber.stateNode),
+              0 === (returnFiber.effectTag & 64) &&
+                null !== rawValue &&
+                "function" === typeof rawValue.componentDidCatch &&
+                !isAlreadyFailedLegacyErrorBoundary(rawValue))
+            ) {
+              ensureUpdateQueues(returnFiber);
+              rawValue = returnFiber.updateQueue;
+              var capturedValues = rawValue.capturedValues;
+              null === capturedValues
+                ? (rawValue.capturedValues = [sourceFiber])
+                : capturedValues.push(sourceFiber);
+              returnFiber.effectTag |= 1024;
+              return;
+            }
+        }
+        returnFiber = returnFiber["return"];
+      } while (null !== returnFiber);
+    },
+    unwindWork: function(workInProgress) {
+      switch (workInProgress.tag) {
+        case 2:
+          popLegacyContextProvider(workInProgress);
+          var effectTag = workInProgress.effectTag;
+          return effectTag & 1024
+            ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+              workInProgress)
+            : null;
+        case 3:
+          return (
+            popHostContainer(workInProgress),
+            popTopLevelLegacyContextObject(workInProgress),
+            (effectTag = workInProgress.effectTag),
+            effectTag & 1024
+              ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+                workInProgress)
+              : null
+          );
+        case 5:
+          return popHostContext(workInProgress), null;
+        case 4:
+          return popHostContainer(workInProgress), null;
+        case 13:
+          return popProvider(workInProgress), null;
+        default:
+          return null;
+      }
+    },
+    unwindInterruptedWork: function(interruptedWork) {
+      switch (interruptedWork.tag) {
+        case 2:
+          popLegacyContextProvider(interruptedWork);
+          break;
+        case 3:
+          popHostContainer(interruptedWork);
+          popTopLevelLegacyContextObject(interruptedWork);
+          break;
+        case 5:
+          popHostContext(interruptedWork);
+          break;
+        case 4:
+          popHostContainer(interruptedWork);
+          break;
+        case 13:
+          popProvider(interruptedWork);
+      }
+    }
+  };
+}
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source;
+  null === errorInfo.stack && getStackAddendumByWorkInProgressFiber(source);
+  null !== source && getComponentName(source);
+  errorInfo = errorInfo.value;
+  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
+  try {
+    (errorInfo && errorInfo.suppressReactErrorLogging) ||
+      console.error(errorInfo);
+  } catch (e) {
+    (e && e.suppressReactErrorLogging) || console.error(e);
+  }
+}
+function ReactFiberCommitWork(
+  config,
+  captureError,
+  scheduleWork,
+  computeExpirationForFiber,
+  markLegacyErrorBoundaryAsFailed
+) {
   function safelyDetachRef(current) {
     var ref = current.ref;
     if (null !== ref)
@@ -4075,48 +4157,77 @@ function ReactFiberCommitWork(config, captureError) {
         } catch (refError) {
           captureError(current, refError);
         }
-      else ref.value = null;
+      else ref.current = null;
+  }
+  function commitBeforeMutationLifeCycles(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case 2:
+        if (finishedWork.effectTag & 2048 && null !== current) {
+          var prevProps = current.memoizedProps,
+            prevState = current.memoizedState;
+          current = finishedWork.stateNode;
+          current.props = finishedWork.memoizedProps;
+          current.state = finishedWork.memoizedState;
+          finishedWork = current.getSnapshotBeforeUpdate(prevProps, prevState);
+          current.__reactInternalSnapshotBeforeUpdate = finishedWork;
+        }
+        break;
+      case 3:
+      case 5:
+      case 6:
+      case 4:
+        break;
+      default:
+        invariant(
+          !1,
+          "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+        );
+    }
   }
-  function commitLifeCycles(current, finishedWork) {
+  function commitLifeCycles(finishedRoot, current, finishedWork) {
     switch (finishedWork.tag) {
       case 2:
-        var instance = finishedWork.stateNode;
+        finishedRoot = finishedWork.stateNode;
         if (finishedWork.effectTag & 4)
           if (null === current)
-            (instance.props = finishedWork.memoizedProps),
-              (instance.state = finishedWork.memoizedState),
-              instance.componentDidMount();
+            (finishedRoot.props = finishedWork.memoizedProps),
+              (finishedRoot.state = finishedWork.memoizedState),
+              finishedRoot.componentDidMount();
           else {
             var prevProps = current.memoizedProps;
             current = current.memoizedState;
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidUpdate(prevProps, current);
+            finishedRoot.props = finishedWork.memoizedProps;
+            finishedRoot.state = finishedWork.memoizedState;
+            finishedRoot.componentDidUpdate(
+              prevProps,
+              current,
+              finishedRoot.__reactInternalSnapshotBeforeUpdate
+            );
           }
         finishedWork = finishedWork.updateQueue;
-        null !== finishedWork && commitCallbacks(finishedWork, instance);
+        null !== finishedWork && commitCallbacks(finishedWork, finishedRoot);
         break;
       case 3:
-        instance = finishedWork.updateQueue;
-        if (null !== instance) {
-          current = null;
+        current = finishedWork.updateQueue;
+        if (null !== current) {
+          finishedRoot = null;
           if (null !== finishedWork.child)
             switch (finishedWork.child.tag) {
               case 5:
-                current = getPublicInstance(finishedWork.child.stateNode);
+                finishedRoot = getPublicInstance(finishedWork.child.stateNode);
                 break;
               case 2:
-                current = finishedWork.child.stateNode;
+                finishedRoot = finishedWork.child.stateNode;
             }
-          commitCallbacks(instance, current);
+          commitCallbacks(current, finishedRoot);
         }
         break;
       case 5:
-        instance = finishedWork.stateNode;
+        finishedRoot = finishedWork.stateNode;
         null === current &&
           finishedWork.effectTag & 4 &&
           commitMount(
-            instance,
+            finishedRoot,
             finishedWork.type,
             finishedWork.memoizedProps,
             finishedWork
@@ -4133,26 +4244,74 @@ function ReactFiberCommitWork(config, captureError) {
         );
     }
   }
+  function commitErrorLogging(finishedWork, onUncaughtError) {
+    switch (finishedWork.tag) {
+      case 2:
+        var ctor = finishedWork.type;
+        onUncaughtError = finishedWork.stateNode;
+        var updateQueue = finishedWork.updateQueue;
+        invariant(
+          null !== updateQueue && null !== updateQueue.capturedValues,
+          "An error logging effect should not have been scheduled if no errors were captured. This error is likely caused by a bug in React. Please file an issue."
+        );
+        var capturedErrors = updateQueue.capturedValues;
+        updateQueue.capturedValues = null;
+        "function" !== typeof ctor.getDerivedStateFromCatch &&
+          markLegacyErrorBoundaryAsFailed(onUncaughtError);
+        onUncaughtError.props = finishedWork.memoizedProps;
+        onUncaughtError.state = finishedWork.memoizedState;
+        for (ctor = 0; ctor < capturedErrors.length; ctor++) {
+          updateQueue = capturedErrors[ctor];
+          var _error = updateQueue.value,
+            stack = updateQueue.stack;
+          logError(finishedWork, updateQueue);
+          onUncaughtError.componentDidCatch(_error, {
+            componentStack: null !== stack ? stack : ""
+          });
+        }
+        break;
+      case 3:
+        ctor = finishedWork.updateQueue;
+        invariant(
+          null !== ctor && null !== ctor.capturedValues,
+          "An error logging effect should not have been scheduled if no errors were captured. This error is likely caused by a bug in React. Please file an issue."
+        );
+        capturedErrors = ctor.capturedValues;
+        ctor.capturedValues = null;
+        for (ctor = 0; ctor < capturedErrors.length; ctor++)
+          (updateQueue = capturedErrors[ctor]),
+            logError(finishedWork, updateQueue),
+            onUncaughtError(updateQueue.value);
+        break;
+      default:
+        invariant(
+          !1,
+          "This unit of work tag cannot capture errors.  This error is likely caused by a bug in React. Please file an issue."
+        );
+    }
+  }
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (null !== ref) {
-      var instance = finishedWork.stateNode;
+      var _instance6 = finishedWork.stateNode;
       switch (finishedWork.tag) {
         case 5:
-          finishedWork = getPublicInstance(instance);
+          finishedWork = getPublicInstance(_instance6);
           break;
         default:
-          finishedWork = instance;
+          finishedWork = _instance6;
       }
       "function" === typeof ref
         ? ref(finishedWork)
-        : (ref.value = finishedWork);
+        : (ref.current = finishedWork);
     }
   }
   function commitDetachRef(current) {
     current = current.ref;
     null !== current &&
-      ("function" === typeof current ? current(null) : (current.value = null));
+      ("function" === typeof current
+        ? current(null)
+        : (current.current = null));
   }
   function commitNestedUnmounts(root) {
     for (var node = root; ; ) {
@@ -4161,12 +4320,12 @@ function ReactFiberCommitWork(config, captureError) {
       switch (current.tag) {
         case 2:
           safelyDetachRef(current);
-          var instance = current.stateNode;
-          if ("function" === typeof instance.componentWillUnmount)
+          var _instance7 = current.stateNode;
+          if ("function" === typeof _instance7.componentWillUnmount)
             try {
-              (instance.props = current.memoizedProps),
-                (instance.state = current.memoizedState),
-                instance.componentWillUnmount();
+              (_instance7.props = current.memoizedProps),
+                (_instance7.state = current.memoizedState),
+                _instance7.componentWillUnmount();
             } catch (unmountError) {
               captureError(current, unmountError);
             }
@@ -4244,6 +4403,8 @@ function ReactFiberCommitWork(config, captureError) {
         commitContainer(finishedWork);
       },
       commitLifeCycles: commitLifeCycles,
+      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
+      commitErrorLogging: commitErrorLogging,
       commitAttachRef: commitAttachRef,
       commitDetachRef: commitDetachRef
     };
@@ -4252,7 +4413,7 @@ function ReactFiberCommitWork(config, captureError) {
   invariant(!1, "Mutating reconciler is disabled.");
 }
 var NO_CONTEXT = {};
-function ReactFiberHostContext(config) {
+function ReactFiberHostContext(config, stack) {
   function requiredContext(c) {
     invariant(
       c !== NO_CONTEXT,
@@ -4261,10 +4422,13 @@ function ReactFiberHostContext(config) {
     return c;
   }
   var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext,
-    contextStackCursor = { current: NO_CONTEXT },
-    contextFiberStackCursor = { current: NO_CONTEXT },
-    rootInstanceStackCursor = { current: NO_CONTEXT };
+    getRootHostContext = config.getRootHostContext;
+  config = stack.createCursor;
+  var push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = config(NO_CONTEXT),
+    contextFiberStackCursor = config(NO_CONTEXT),
+    rootInstanceStackCursor = config(NO_CONTEXT);
   return {
     getHostContext: function() {
       return requiredContext(contextStackCursor.current);
@@ -4283,8 +4447,10 @@ function ReactFiberHostContext(config) {
     },
     pushHostContainer: function(fiber, nextRootInstance) {
       push(rootInstanceStackCursor, nextRootInstance, fiber);
-      nextRootInstance = getRootHostContext(nextRootInstance);
       push(contextFiberStackCursor, fiber, fiber);
+      push(contextStackCursor, NO_CONTEXT, fiber);
+      nextRootInstance = getRootHostContext(nextRootInstance);
+      pop(contextStackCursor, fiber);
       push(contextStackCursor, nextRootInstance, fiber);
     },
     pushHostContext: function(fiber) {
@@ -4294,10 +4460,6 @@ function ReactFiberHostContext(config) {
       context !== rootInstance &&
         (push(contextFiberStackCursor, fiber, fiber),
         push(contextStackCursor, rootInstance, fiber));
-    },
-    resetHostContainer: function() {
-      contextStackCursor.current = NO_CONTEXT;
-      rootInstanceStackCursor.current = NO_CONTEXT;
     }
   };
 }
@@ -4457,56 +4619,278 @@ function ReactFiberHydrationContext(config) {
     }
   };
 }
+function ReactFiberLegacyContext(stack) {
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    workInProgress = workInProgress.stateNode;
+    workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    workInProgress.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
+  function isContextProvider(fiber) {
+    return 2 === fiber.tag && null != fiber.type.childContextTypes;
+  }
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode,
+      childContextTypes = fiber.type.childContextTypes;
+    if ("function" !== typeof instance.getChildContext) return parentContext;
+    instance = instance.getChildContext();
+    for (var contextKey in instance)
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    return Object.assign({}, parentContext, instance);
+  }
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = createCursor(emptyObject),
+    didPerformWorkStackCursor = createCursor(!1),
+    previousContext = emptyObject;
+  return {
+    getUnmaskedContext: function(workInProgress) {
+      return isContextProvider(workInProgress)
+        ? previousContext
+        : contextStackCursor.current;
+    },
+    cacheContext: cacheContext,
+    getMaskedContext: function(workInProgress, unmaskedContext) {
+      var contextTypes = workInProgress.type.contextTypes;
+      if (!contextTypes) return emptyObject;
+      var instance = workInProgress.stateNode;
+      if (
+        instance &&
+        instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+      )
+        return instance.__reactInternalMemoizedMaskedChildContext;
+      var context = {},
+        key;
+      for (key in contextTypes) context[key] = unmaskedContext[key];
+      instance && cacheContext(workInProgress, unmaskedContext, context);
+      return context;
+    },
+    hasContextChanged: function() {
+      return didPerformWorkStackCursor.current;
+    },
+    isContextConsumer: function(fiber) {
+      return 2 === fiber.tag && null != fiber.type.contextTypes;
+    },
+    isContextProvider: isContextProvider,
+    popContextProvider: function(fiber) {
+      isContextProvider(fiber) &&
+        (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+    },
+    popTopLevelContextObject: function(fiber) {
+      pop(didPerformWorkStackCursor, fiber);
+      pop(contextStackCursor, fiber);
+    },
+    pushTopLevelContextObject: function(fiber, context, didChange) {
+      invariant(
+        null == contextStackCursor.cursor,
+        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+      );
+      push(contextStackCursor, context, fiber);
+      push(didPerformWorkStackCursor, didChange, fiber);
+    },
+    processChildContext: processChildContext,
+    pushContextProvider: function(workInProgress) {
+      if (!isContextProvider(workInProgress)) return !1;
+      var instance = workInProgress.stateNode;
+      instance =
+        (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+        emptyObject;
+      previousContext = contextStackCursor.current;
+      push(contextStackCursor, instance, workInProgress);
+      push(
+        didPerformWorkStackCursor,
+        didPerformWorkStackCursor.current,
+        workInProgress
+      );
+      return !0;
+    },
+    invalidateContextProvider: function(workInProgress, didChange) {
+      var instance = workInProgress.stateNode;
+      invariant(
+        instance,
+        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+      );
+      if (didChange) {
+        var mergedContext = processChildContext(
+          workInProgress,
+          previousContext
+        );
+        instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+        pop(didPerformWorkStackCursor, workInProgress);
+        pop(contextStackCursor, workInProgress);
+        push(contextStackCursor, mergedContext, workInProgress);
+      } else pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    },
+    findCurrentUnmaskedContext: function(fiber) {
+      for (
+        invariant(
+          2 === isFiberMountedImpl(fiber) && 2 === fiber.tag,
+          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+        );
+        3 !== fiber.tag;
+
+      ) {
+        if (isContextProvider(fiber))
+          return fiber.stateNode.__reactInternalMemoizedMergedChildContext;
+        fiber = fiber["return"];
+        invariant(
+          fiber,
+          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+      return fiber.stateNode.context;
+    }
+  };
+}
+function ReactFiberNewContext(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    providerCursor = createCursor(null),
+    valueCursor = createCursor(null),
+    changedBitsCursor = createCursor(0);
+  return {
+    pushProvider: function(providerFiber) {
+      var context = providerFiber.type._context;
+      push(changedBitsCursor, context._changedBits, providerFiber);
+      push(valueCursor, context._currentValue, providerFiber);
+      push(providerCursor, providerFiber, providerFiber);
+      context._currentValue = providerFiber.pendingProps.value;
+      context._changedBits = providerFiber.stateNode;
+    },
+    popProvider: function(providerFiber) {
+      var changedBits = changedBitsCursor.current,
+        currentValue = valueCursor.current;
+      pop(providerCursor, providerFiber);
+      pop(valueCursor, providerFiber);
+      pop(changedBitsCursor, providerFiber);
+      providerFiber = providerFiber.type._context;
+      providerFiber._currentValue = currentValue;
+      providerFiber._changedBits = changedBits;
+    }
+  };
+}
+function ReactFiberStack() {
+  var valueStack = [],
+    index = -1;
+  return {
+    createCursor: function(defaultValue) {
+      return { current: defaultValue };
+    },
+    isEmpty: function() {
+      return -1 === index;
+    },
+    pop: function(cursor) {
+      0 > index ||
+        ((cursor.current = valueStack[index]),
+        (valueStack[index] = null),
+        index--);
+    },
+    push: function(cursor, value) {
+      index++;
+      valueStack[index] = cursor.current;
+      cursor.current = value;
+    },
+    checkThatStackIsEmpty: function() {},
+    resetStackAfterFatalErrorInDev: function() {}
+  };
+}
 function ReactFiberScheduler(config) {
+  function resetStack() {
+    if (null !== nextUnitOfWork)
+      for (
+        var interruptedWork = nextUnitOfWork["return"];
+        null !== interruptedWork;
+
+      )
+        unwindInterruptedWork(interruptedWork),
+          (interruptedWork = interruptedWork["return"]);
+    nextRoot = null;
+    nextRenderExpirationTime = 0;
+    nextUnitOfWork = null;
+    isRootReadyForCommit = !1;
+  }
+  function isAlreadyFailedLegacyErrorBoundary(instance) {
+    return (
+      null !== legacyErrorBoundariesThatAlreadyFailed &&
+      legacyErrorBoundariesThatAlreadyFailed.has(instance)
+    );
+  }
   function completeUnitOfWork(workInProgress$jscomp$0) {
     for (;;) {
-      var next = completeWork(
-          workInProgress$jscomp$0.alternate,
-          workInProgress$jscomp$0,
-          nextRenderExpirationTime
-        ),
+      var current = workInProgress$jscomp$0.alternate,
         returnFiber = workInProgress$jscomp$0["return"],
         siblingFiber = workInProgress$jscomp$0.sibling;
-      var workInProgress = workInProgress$jscomp$0;
-      if (
-        1073741823 === nextRenderExpirationTime ||
-        1073741823 !== workInProgress.expirationTime
-      ) {
-        if (2 !== workInProgress.tag && 3 !== workInProgress.tag)
-          var newExpirationTime = 0;
-        else
-          (newExpirationTime = workInProgress.updateQueue),
-            (newExpirationTime =
-              null === newExpirationTime
-                ? 0
-                : newExpirationTime.expirationTime);
-        for (var child = workInProgress.child; null !== child; )
-          0 !== child.expirationTime &&
-            (0 === newExpirationTime ||
-              newExpirationTime > child.expirationTime) &&
-            (newExpirationTime = child.expirationTime),
-            (child = child.sibling);
-        workInProgress.expirationTime = newExpirationTime;
-      }
-      if (null !== next) return next;
-      null !== returnFiber &&
-        (null === returnFiber.firstEffect &&
-          (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
-        null !== workInProgress$jscomp$0.lastEffect &&
-          (null !== returnFiber.lastEffect &&
-            (returnFiber.lastEffect.nextEffect =
-              workInProgress$jscomp$0.firstEffect),
-          (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
-        1 < workInProgress$jscomp$0.effectTag &&
-          (null !== returnFiber.lastEffect
-            ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
-            : (returnFiber.firstEffect = workInProgress$jscomp$0),
-          (returnFiber.lastEffect = workInProgress$jscomp$0)));
-      if (null !== siblingFiber) return siblingFiber;
-      if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
-      else {
-        workInProgress$jscomp$0.stateNode.isReadyForCommit = !0;
-        break;
+      if (0 === (workInProgress$jscomp$0.effectTag & 512)) {
+        current = completeWork(
+          current,
+          workInProgress$jscomp$0,
+          nextRenderExpirationTime
+        );
+        var workInProgress = workInProgress$jscomp$0;
+        if (
+          1073741823 === nextRenderExpirationTime ||
+          1073741823 !== workInProgress.expirationTime
+        ) {
+          b: switch (workInProgress.tag) {
+            case 3:
+            case 2:
+              var newExpirationTime = workInProgress.updateQueue;
+              newExpirationTime =
+                null === newExpirationTime
+                  ? 0
+                  : newExpirationTime.expirationTime;
+              break b;
+            default:
+              newExpirationTime = 0;
+          }
+          for (var child = workInProgress.child; null !== child; )
+            0 !== child.expirationTime &&
+              (0 === newExpirationTime ||
+                newExpirationTime > child.expirationTime) &&
+              (newExpirationTime = child.expirationTime),
+              (child = child.sibling);
+          workInProgress.expirationTime = newExpirationTime;
+        }
+        if (null !== current) return current;
+        null !== returnFiber &&
+          0 === (returnFiber.effectTag & 512) &&
+          (null === returnFiber.firstEffect &&
+            (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
+          null !== workInProgress$jscomp$0.lastEffect &&
+            (null !== returnFiber.lastEffect &&
+              (returnFiber.lastEffect.nextEffect =
+                workInProgress$jscomp$0.firstEffect),
+            (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
+          1 < workInProgress$jscomp$0.effectTag &&
+            (null !== returnFiber.lastEffect
+              ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
+              : (returnFiber.firstEffect = workInProgress$jscomp$0),
+            (returnFiber.lastEffect = workInProgress$jscomp$0)));
+        if (null !== siblingFiber) return siblingFiber;
+        if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+        else {
+          isRootReadyForCommit = !0;
+          break;
+        }
+      } else {
+        workInProgress$jscomp$0 = unwindWork(workInProgress$jscomp$0);
+        if (null !== workInProgress$jscomp$0)
+          return (
+            (workInProgress$jscomp$0.effectTag &= 2559), workInProgress$jscomp$0
+          );
+        null !== returnFiber &&
+          ((returnFiber.firstEffect = returnFiber.lastEffect = null),
+          (returnFiber.effectTag |= 512));
+        if (null !== siblingFiber) return siblingFiber;
+        if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+        else break;
       }
     }
     return null;
@@ -4521,247 +4905,114 @@ function ReactFiberScheduler(config) {
     ReactCurrentOwner.current = null;
     return next;
   }
-  function performFailedUnitOfWork(workInProgress) {
-    var next = beginFailedWork(
-      workInProgress.alternate,
-      workInProgress,
-      nextRenderExpirationTime
-    );
-    null === next && (next = completeUnitOfWork(workInProgress));
-    ReactCurrentOwner.current = null;
-    return next;
-  }
-  function workLoop(isAsync) {
-    if (null !== capturedErrors)
-      if (isAsync)
-        for (; null !== nextUnitOfWork && !shouldYield(); )
-          nextUnitOfWork = hasCapturedError(nextUnitOfWork)
-            ? performFailedUnitOfWork(nextUnitOfWork)
-            : performUnitOfWork(nextUnitOfWork);
-      else
-        for (; null !== nextUnitOfWork; )
-          nextUnitOfWork = hasCapturedError(nextUnitOfWork)
-            ? performFailedUnitOfWork(nextUnitOfWork)
-            : performUnitOfWork(nextUnitOfWork);
-    else if (isAsync)
-      for (; null !== nextUnitOfWork && !shouldYield(); )
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-    else
-      for (; null !== nextUnitOfWork; )
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-  }
   function renderRoot(root, expirationTime, isAsync) {
     invariant(
       !isWorking,
       "renderRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
     );
     isWorking = !0;
-    root.isReadyForCommit = !1;
     if (
-      root !== nextRoot ||
       expirationTime !== nextRenderExpirationTime ||
+      root !== nextRoot ||
       null === nextUnitOfWork
-    ) {
-      for (; -1 < index; ) (valueStack[index] = null), index--;
-      previousContext = emptyObject;
-      contextStackCursor.current = emptyObject;
-      didPerformWorkStackCursor.current = !1;
-      for (var i = index$1; -1 < i; i--) {
-        var context = stack[i].type.context;
-        context.currentValue = context.defaultValue;
-        context.changedBits = 0;
-        changedBitsStack[i] = null;
-        currentValueStack[i] = null;
-        stack[i] = null;
-      }
-      index$1 = -1;
-      resetHostContainer();
-      nextRoot = root;
-      nextRenderExpirationTime = expirationTime;
-      nextUnitOfWork = createWorkInProgress(
-        nextRoot.current,
-        null,
-        expirationTime
-      );
-    }
-    i = !1;
-    context = null;
-    try {
-      workLoop(isAsync);
-    } catch (e) {
-      (i = !0), (context = e);
-    }
-    for (; i; ) {
-      if (didFatal) {
-        firstUncaughtError = context;
-        break;
-      }
-      expirationTime = nextUnitOfWork;
-      if (null === expirationTime) didFatal = !0;
-      else {
-        var boundary = captureError(expirationTime, context);
-        invariant(
-          null !== boundary,
-          "Should have found an error boundary. This error is likely caused by a bug in React. Please file an issue."
-        );
-        if (!didFatal) {
-          try {
-            i = boundary;
-            context = isAsync;
-            for (boundary = i; null !== expirationTime; ) {
-              switch (expirationTime.tag) {
-                case 2:
-                  popContextProvider(expirationTime);
-                  break;
-                case 5:
-                  popHostContext(expirationTime);
-                  break;
-                case 3:
-                  popHostContainer(expirationTime);
-                  break;
-                case 4:
-                  popHostContainer(expirationTime);
-                  break;
-                case 13:
-                  popProvider(expirationTime);
-              }
-              if (
-                expirationTime === boundary ||
-                expirationTime.alternate === boundary
-              )
-                break;
-              expirationTime = expirationTime["return"];
-            }
-            nextUnitOfWork = performFailedUnitOfWork(i);
-            workLoop(context);
-          } catch (e) {
-            i = !0;
-            context = e;
-            continue;
-          }
+    )
+      resetStack(),
+        (nextRoot = root),
+        (nextRenderExpirationTime = expirationTime),
+        (nextUnitOfWork = createWorkInProgress(
+          nextRoot.current,
+          null,
+          nextRenderExpirationTime
+        )),
+        (root.pendingCommitExpirationTime = 0);
+    var didFatal = !1;
+    do {
+      try {
+        if (isAsync)
+          for (; null !== nextUnitOfWork && !shouldYield(); )
+            nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+        else
+          for (; null !== nextUnitOfWork; )
+            nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+      } catch (thrownValue) {
+        if (null === nextUnitOfWork) {
+          didFatal = !0;
+          onUncaughtError(thrownValue);
           break;
         }
-      }
-    }
-    isAsync = firstUncaughtError;
-    didFatal = isWorking = !1;
-    firstUncaughtError = null;
-    null !== isAsync && onUncaughtError(isAsync);
-    return root.isReadyForCommit ? root.current.alternate : null;
-  }
-  function captureError(failedWork, error$jscomp$0) {
-    var boundary = (ReactCurrentOwner.current = null),
-      errorBoundaryFound = !1,
-      willRetry = !1,
-      errorBoundaryName = null;
-    if (3 === failedWork.tag)
-      (boundary = failedWork), isFailedBoundary(failedWork) && (didFatal = !0);
-    else
-      for (
-        var node = failedWork["return"];
-        null !== node && null === boundary;
-
-      ) {
-        2 === node.tag
-          ? "function" === typeof node.stateNode.componentDidCatch &&
-            ((errorBoundaryFound = !0),
-            (errorBoundaryName = getComponentName(node)),
-            (boundary = node),
-            (willRetry = !0))
-          : 3 === node.tag && (boundary = node);
-        if (isFailedBoundary(node)) {
-          if (
-            isUnmounting ||
-            (null !== commitPhaseBoundaries &&
-              (commitPhaseBoundaries.has(node) ||
-                (null !== node.alternate &&
-                  commitPhaseBoundaries.has(node.alternate))))
-          )
-            return null;
-          boundary = null;
-          willRetry = !1;
+        isAsync = nextUnitOfWork;
+        var returnFiber = isAsync["return"];
+        if (null === returnFiber) {
+          didFatal = !0;
+          onUncaughtError(thrownValue);
+          break;
         }
-        node = node["return"];
+        throwException(returnFiber, isAsync, thrownValue);
+        nextUnitOfWork = completeUnitOfWork(isAsync);
       }
-    if (null !== boundary) {
-      null === failedBoundaries && (failedBoundaries = new Set());
-      failedBoundaries.add(boundary);
-      var info = "";
-      node = failedWork;
-      do {
-        a: switch (node.tag) {
-          case 0:
-          case 1:
+      break;
+    } while (1);
+    isWorking = !1;
+    if (didFatal || null !== nextUnitOfWork) return null;
+    if (isRootReadyForCommit)
+      return (
+        (root.pendingCommitExpirationTime = expirationTime),
+        root.current.alternate
+      );
+    invariant(
+      !1,
+      "Expired work should have completed. This error is likely caused by a bug in React. Please file an issue."
+    );
+  }
+  function scheduleCapture(sourceFiber, boundaryFiber, value, expirationTime) {
+    sourceFiber = {
+      value: value,
+      source: sourceFiber,
+      stack: getStackAddendumByWorkInProgressFiber(sourceFiber)
+    };
+    insertUpdateIntoFiber(boundaryFiber, {
+      expirationTime: expirationTime,
+      partialState: null,
+      callback: null,
+      isReplace: !1,
+      isForced: !1,
+      capturedValue: sourceFiber,
+      next: null
+    });
+    scheduleWork(boundaryFiber, expirationTime);
+  }
+  function onCommitPhaseError(fiber$jscomp$0, error) {
+    a: {
+      invariant(
+        !isWorking || isCommitting,
+        "dispatch: Cannot dispatch during the render phase."
+      );
+      for (var fiber = fiber$jscomp$0["return"]; null !== fiber; ) {
+        switch (fiber.tag) {
           case 2:
-          case 5:
-            var owner = node._debugOwner,
-              source = node._debugSource;
-            var JSCompiler_inline_result = getComponentName(node);
-            var ownerName = null;
-            owner && (ownerName = getComponentName(owner));
-            owner = source;
-            JSCompiler_inline_result =
-              "\n    in " +
-              (JSCompiler_inline_result || "Unknown") +
-              (owner
-                ? " (at " +
-                  owner.fileName.replace(/^.*[\\\/]/, "") +
-                  ":" +
-                  owner.lineNumber +
-                  ")"
-                : ownerName ? " (created by " + ownerName + ")" : "");
+            var instance = fiber.stateNode;
+            if (
+              "function" === typeof fiber.type.getDerivedStateFromCatch ||
+              ("function" === typeof instance.componentDidCatch &&
+                !isAlreadyFailedLegacyErrorBoundary(instance))
+            ) {
+              scheduleCapture(fiber$jscomp$0, fiber, error, 1);
+              fiber$jscomp$0 = void 0;
+              break a;
+            }
+            break;
+          case 3:
+            scheduleCapture(fiber$jscomp$0, fiber, error, 1);
+            fiber$jscomp$0 = void 0;
             break a;
-          default:
-            JSCompiler_inline_result = "";
         }
-        info += JSCompiler_inline_result;
-        node = node["return"];
-      } while (node);
-      node = info;
-      failedWork = getComponentName(failedWork);
-      null === capturedErrors && (capturedErrors = new Map());
-      error$jscomp$0 = {
-        componentName: failedWork,
-        componentStack: node,
-        error: error$jscomp$0,
-        errorBoundary: errorBoundaryFound ? boundary.stateNode : null,
-        errorBoundaryFound: errorBoundaryFound,
-        errorBoundaryName: errorBoundaryName,
-        willRetry: willRetry
-      };
-      capturedErrors.set(boundary, error$jscomp$0);
-      try {
-        var error = error$jscomp$0.error;
-        (error && error.suppressReactErrorLogging) || console.error(error);
-      } catch (e) {
-        (e && e.suppressReactErrorLogging) || console.error(e);
+        fiber = fiber["return"];
       }
-      isCommitting
-        ? (null === commitPhaseBoundaries &&
-            (commitPhaseBoundaries = new Set()),
-          commitPhaseBoundaries.add(boundary))
-        : scheduleErrorRecovery(boundary);
-      return boundary;
+      3 === fiber$jscomp$0.tag &&
+        scheduleCapture(fiber$jscomp$0, fiber$jscomp$0, error, 1);
+      fiber$jscomp$0 = void 0;
     }
-    null === firstUncaughtError && (firstUncaughtError = error$jscomp$0);
-    return null;
-  }
-  function hasCapturedError(fiber) {
-    return (
-      null !== capturedErrors &&
-      (capturedErrors.has(fiber) ||
-        (null !== fiber.alternate && capturedErrors.has(fiber.alternate)))
-    );
-  }
-  function isFailedBoundary(fiber) {
-    return (
-      null !== failedBoundaries &&
-      (failedBoundaries.has(fiber) ||
-        (null !== fiber.alternate && failedBoundaries.has(fiber.alternate)))
-    );
-  }
-  function computeAsyncExpiration() {
-    return 20 * ((((recalculateCurrentTime() + 100) / 20) | 0) + 1);
+    return fiber$jscomp$0;
   }
   function computeExpirationForFiber(fiber) {
     fiber =
@@ -4772,7 +5023,7 @@ function ReactFiberScheduler(config) {
           : fiber.mode & 1
             ? isBatchingInteractiveUpdates
               ? 10 * ((((recalculateCurrentTime() + 50) / 10) | 0) + 1)
-              : computeAsyncExpiration()
+              : 25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1)
             : 1;
     isBatchingInteractiveUpdates &&
       (0 === lowestPendingInteractiveExpirationTime ||
@@ -4781,39 +5032,41 @@ function ReactFiberScheduler(config) {
     return fiber;
   }
   function scheduleWork(fiber, expirationTime) {
-    return scheduleWorkImpl(fiber, expirationTime, !1);
-  }
-  function scheduleWorkImpl(fiber, expirationTime) {
-    for (; null !== fiber; ) {
-      if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
-        fiber.expirationTime = expirationTime;
-      null !== fiber.alternate &&
-        (0 === fiber.alternate.expirationTime ||
-          fiber.alternate.expirationTime > expirationTime) &&
-        (fiber.alternate.expirationTime = expirationTime);
-      if (null === fiber["return"])
-        if (3 === fiber.tag) {
-          var root = fiber.stateNode;
-          !isWorking &&
-            root === nextRoot &&
-            expirationTime < nextRenderExpirationTime &&
-            ((nextUnitOfWork = nextRoot = null),
-            (nextRenderExpirationTime = 0));
-          requestWork(root, expirationTime);
-          !isWorking &&
-            root === nextRoot &&
-            expirationTime < nextRenderExpirationTime &&
-            ((nextUnitOfWork = nextRoot = null),
-            (nextRenderExpirationTime = 0));
-        } else break;
-      fiber = fiber["return"];
+    a: {
+      for (; null !== fiber; ) {
+        if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
+          fiber.expirationTime = expirationTime;
+        null !== fiber.alternate &&
+          (0 === fiber.alternate.expirationTime ||
+            fiber.alternate.expirationTime > expirationTime) &&
+          (fiber.alternate.expirationTime = expirationTime);
+        if (null === fiber["return"])
+          if (3 === fiber.tag) {
+            var root = fiber.stateNode;
+            !isWorking &&
+              0 !== nextRenderExpirationTime &&
+              expirationTime < nextRenderExpirationTime &&
+              resetStack();
+            (isWorking && !isCommitting && nextRoot === root) ||
+              requestWork(root, expirationTime);
+            nestedUpdateCount > NESTED_UPDATE_LIMIT &&
+              invariant(
+                !1,
+                "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
+              );
+          } else {
+            expirationTime = void 0;
+            break a;
+          }
+        fiber = fiber["return"];
+      }
+      expirationTime = void 0;
     }
-  }
-  function scheduleErrorRecovery(fiber) {
-    scheduleWorkImpl(fiber, 1, !0);
+    return expirationTime;
   }
   function recalculateCurrentTime() {
-    return (mostRecentCurrentTime = (((now() - startTime) / 10) | 0) + 2);
+    mostRecentCurrentTimeMs = now() - originalStartTimeMs;
+    return (mostRecentCurrentTime = ((mostRecentCurrentTimeMs / 10) | 0) + 2);
   }
   function syncUpdates(fn, a, b, c, d) {
     var previousExpirationContext = expirationContext;
@@ -4829,18 +5082,13 @@ function ReactFiberScheduler(config) {
       if (expirationTime > callbackExpirationTime) return;
       cancelDeferredCallback(callbackID);
     }
-    var currentMs = now() - startTime;
+    var currentMs = now() - originalStartTimeMs;
     callbackExpirationTime = expirationTime;
     callbackID = scheduleDeferredCallback(performAsyncWork, {
       timeout: 10 * (expirationTime - 2) - currentMs
     });
   }
   function requestWork(root, expirationTime) {
-    nestedUpdateCount > NESTED_UPDATE_LIMIT &&
-      invariant(
-        !1,
-        "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
-      );
     if (null === root.nextScheduledRoot)
       (root.remainingExpirationTime = expirationTime),
         null === lastScheduledRoot
@@ -4863,7 +5111,7 @@ function ReactFiberScheduler(config) {
           (nextFlushedExpirationTime = 1),
           performWorkOnRoot(root, 1, !1))
         : 1 === expirationTime
-          ? performWork(1, !1, null)
+          ? performSyncWork()
           : scheduleCallbackWithExpiration(expirationTime));
   }
   function findHighestPriorityRoot() {
@@ -4913,7 +5161,8 @@ function ReactFiberScheduler(config) {
       }
     previousScheduledRoot = nextFlushedRoot;
     null !== previousScheduledRoot &&
-    previousScheduledRoot === highestPriorityRoot
+    previousScheduledRoot === highestPriorityRoot &&
+    1 === highestPriorityWork
       ? nestedUpdateCount++
       : (nestedUpdateCount = 0);
     nextFlushedRoot = highestPriorityRoot;
@@ -4922,6 +5171,9 @@ function ReactFiberScheduler(config) {
   function performAsyncWork(dl) {
     performWork(0, !0, dl);
   }
+  function performSyncWork() {
+    performWork(1, !1, null);
+  }
   function performWork(minExpirationTime, isAsync, dl) {
     deadline = dl;
     findHighestPriorityRoot();
@@ -4958,10 +5210,10 @@ function ReactFiberScheduler(config) {
       scheduleCallbackWithExpiration(nextFlushedExpirationTime);
     deadline = null;
     deadlineDidExpire = !1;
-    nestedUpdateCount = 0;
     finishRendering();
   }
   function finishRendering() {
+    nestedUpdateCount = 0;
     if (null !== completedBatches) {
       var batches = completedBatches;
       completedBatches = null;
@@ -5026,18 +5278,43 @@ function ReactFiberScheduler(config) {
       expirationTime.current !== finishedWork,
       "Cannot commit the same tree as before. This is probably a bug related to the return field. This error is likely caused by a bug in React. Please file an issue."
     );
-    expirationTime.isReadyForCommit = !1;
+    firstBatch = expirationTime.pendingCommitExpirationTime;
+    invariant(
+      0 !== firstBatch,
+      "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue."
+    );
+    expirationTime.pendingCommitExpirationTime = 0;
+    var currentTime = recalculateCurrentTime();
     ReactCurrentOwner.current = null;
-    1 < finishedWork.effectTag
-      ? null !== finishedWork.lastEffect
-        ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-          (firstBatch = finishedWork.firstEffect))
-        : (firstBatch = finishedWork)
-      : (firstBatch = finishedWork.firstEffect);
+    if (1 < finishedWork.effectTag)
+      if (null !== finishedWork.lastEffect) {
+        finishedWork.lastEffect.nextEffect = finishedWork;
+        var firstEffect = finishedWork.firstEffect;
+      } else firstEffect = finishedWork;
+    else firstEffect = finishedWork.firstEffect;
     prepareForCommit(expirationTime.containerInfo);
-    for (nextEffect = firstBatch; null !== nextEffect; ) {
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
       var didError = !1,
-        _error = void 0;
+        error = void 0;
+      try {
+        for (; null !== nextEffect; )
+          nextEffect.effectTag & 2048 &&
+            commitBeforeMutationLifeCycles(nextEffect.alternate, nextEffect),
+            (nextEffect = nextEffect.nextEffect);
+      } catch (e) {
+        (didError = !0), (error = e);
+      }
+      didError &&
+        (invariant(
+          null !== nextEffect,
+          "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+        ),
+        onCommitPhaseError(nextEffect, error),
+        null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+    }
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
+      didError = !1;
+      error = void 0;
       try {
         for (; null !== nextEffect; ) {
           var effectTag = nextEffect.effectTag;
@@ -5046,7 +5323,7 @@ function ReactFiberScheduler(config) {
             var current = nextEffect.alternate;
             null !== current && commitDetachRef(current);
           }
-          switch (effectTag & -242) {
+          switch (effectTag & 14) {
             case 2:
               commitPlacement(nextEffect);
               nextEffect.effectTag &= -3;
@@ -5060,65 +5337,46 @@ function ReactFiberScheduler(config) {
               commitWork(nextEffect.alternate, nextEffect);
               break;
             case 8:
-              (isUnmounting = !0),
-                commitDeletion(nextEffect),
-                (isUnmounting = !1);
+              commitDeletion(nextEffect);
           }
           nextEffect = nextEffect.nextEffect;
         }
       } catch (e) {
-        (didError = !0), (_error = e);
+        (didError = !0), (error = e);
       }
       didError &&
         (invariant(
           null !== nextEffect,
           "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
         ),
-        captureError(nextEffect, _error),
+        onCommitPhaseError(nextEffect, error),
         null !== nextEffect && (nextEffect = nextEffect.nextEffect));
     }
     resetAfterCommit(expirationTime.containerInfo);
     expirationTime.current = finishedWork;
-    for (nextEffect = firstBatch; null !== nextEffect; ) {
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
       effectTag = !1;
       current = void 0;
       try {
-        for (; null !== nextEffect; ) {
+        for (
+          firstEffect = expirationTime,
+            didError = currentTime,
+            error = firstBatch;
+          null !== nextEffect;
+
+        ) {
           var effectTag$jscomp$0 = nextEffect.effectTag;
           effectTag$jscomp$0 & 36 &&
-            commitLifeCycles(nextEffect.alternate, nextEffect);
+            commitLifeCycles(
+              firstEffect,
+              nextEffect.alternate,
+              nextEffect,
+              didError,
+              error
+            );
+          effectTag$jscomp$0 & 256 &&
+            commitErrorLogging(nextEffect, onUncaughtError);
           effectTag$jscomp$0 & 128 && commitAttachRef(nextEffect);
-          if (effectTag$jscomp$0 & 64)
-            switch (((firstBatch = nextEffect),
-            (didError = void 0),
-            null !== capturedErrors &&
-              ((didError = capturedErrors.get(firstBatch)),
-              capturedErrors["delete"](firstBatch),
-              null == didError &&
-                null !== firstBatch.alternate &&
-                ((firstBatch = firstBatch.alternate),
-                (didError = capturedErrors.get(firstBatch)),
-                capturedErrors["delete"](firstBatch))),
-            invariant(
-              null != didError,
-              "No error for given unit of work. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            firstBatch.tag)) {
-              case 2:
-                firstBatch.stateNode.componentDidCatch(didError.error, {
-                  componentStack: didError.componentStack
-                });
-                break;
-              case 3:
-                null === firstUncaughtError &&
-                  (firstUncaughtError = didError.error);
-                break;
-              default:
-                invariant(
-                  !1,
-                  "Invalid type of work. This error is likely caused by a bug in React. Please file an issue."
-                );
-            }
           var next = nextEffect.nextEffect;
           nextEffect.nextEffect = null;
           nextEffect = next;
@@ -5131,20 +5389,13 @@ function ReactFiberScheduler(config) {
           null !== nextEffect,
           "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
         ),
-        captureError(nextEffect, current),
+        onCommitPhaseError(nextEffect, current),
         null !== nextEffect && (nextEffect = nextEffect.nextEffect));
     }
     isWorking = isCommitting = !1;
     "function" === typeof onCommitRoot && onCommitRoot(finishedWork.stateNode);
-    commitPhaseBoundaries &&
-      (commitPhaseBoundaries.forEach(scheduleErrorRecovery),
-      (commitPhaseBoundaries = null));
-    null !== firstUncaughtError &&
-      ((finishedWork = firstUncaughtError),
-      (firstUncaughtError = null),
-      onUncaughtError(finishedWork));
     finishedWork = expirationTime.current.expirationTime;
-    0 === finishedWork && (failedBoundaries = capturedErrors = null);
+    0 === finishedWork && (legacyErrorBoundariesThatAlreadyFailed = null);
     root.remainingExpirationTime = finishedWork;
   }
   function shouldYield() {
@@ -5161,28 +5412,57 @@ function ReactFiberScheduler(config) {
     nextFlushedRoot.remainingExpirationTime = 0;
     hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
   }
-  var hostContext = ReactFiberHostContext(config),
-    hydrationContext = ReactFiberHydrationContext(config),
-    popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext,
-    resetHostContainer = hostContext.resetHostContainer,
-    _ReactFiberBeginWork = ReactFiberBeginWork(
+  var stack = ReactFiberStack(),
+    hostContext = ReactFiberHostContext(config, stack),
+    legacyContext = ReactFiberLegacyContext(stack);
+  stack = ReactFiberNewContext(stack);
+  var hydrationContext = ReactFiberHydrationContext(config),
+    beginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      stack,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
-    ),
-    beginWork = _ReactFiberBeginWork.beginWork,
-    beginFailedWork = _ReactFiberBeginWork.beginFailedWork,
-    completeWork = ReactFiberCompleteWork(config, hostContext, hydrationContext)
-      .completeWork;
-  hostContext = ReactFiberCommitWork(config, captureError);
-  var commitResetTextContent = hostContext.commitResetTextContent,
+    ).beginWork,
+    completeWork = ReactFiberCompleteWork(
+      config,
+      hostContext,
+      legacyContext,
+      stack,
+      hydrationContext
+    ).completeWork;
+  hostContext = ReactFiberUnwindWork(
+    hostContext,
+    legacyContext,
+    stack,
+    scheduleWork,
+    isAlreadyFailedLegacyErrorBoundary
+  );
+  var throwException = hostContext.throwException,
+    unwindWork = hostContext.unwindWork,
+    unwindInterruptedWork = hostContext.unwindInterruptedWork;
+  hostContext = ReactFiberCommitWork(
+    config,
+    onCommitPhaseError,
+    scheduleWork,
+    computeExpirationForFiber,
+    function(instance) {
+      null === legacyErrorBoundariesThatAlreadyFailed
+        ? (legacyErrorBoundariesThatAlreadyFailed = new Set([instance]))
+        : legacyErrorBoundariesThatAlreadyFailed.add(instance);
+    },
+    recalculateCurrentTime
+  );
+  var commitBeforeMutationLifeCycles =
+      hostContext.commitBeforeMutationLifeCycles,
+    commitResetTextContent = hostContext.commitResetTextContent,
     commitPlacement = hostContext.commitPlacement,
     commitDeletion = hostContext.commitDeletion,
     commitWork = hostContext.commitWork,
     commitLifeCycles = hostContext.commitLifeCycles,
+    commitErrorLogging = hostContext.commitErrorLogging,
     commitAttachRef = hostContext.commitAttachRef,
     commitDetachRef = hostContext.commitDetachRef,
     now = config.now,
@@ -5190,8 +5470,9 @@ function ReactFiberScheduler(config) {
     cancelDeferredCallback = config.cancelDeferredCallback,
     prepareForCommit = config.prepareForCommit,
     resetAfterCommit = config.resetAfterCommit,
-    startTime = now(),
+    originalStartTimeMs = now(),
     mostRecentCurrentTime = 2,
+    mostRecentCurrentTimeMs = originalStartTimeMs,
     lastUniqueAsyncExpiration = 0,
     expirationContext = 0,
     isWorking = !1,
@@ -5199,13 +5480,9 @@ function ReactFiberScheduler(config) {
     nextRoot = null,
     nextRenderExpirationTime = 0,
     nextEffect = null,
-    capturedErrors = null,
-    failedBoundaries = null,
-    commitPhaseBoundaries = null,
-    firstUncaughtError = null,
-    didFatal = !1,
     isCommitting = !1,
-    isUnmounting = !1,
+    isRootReadyForCommit = !1,
+    legacyErrorBoundariesThatAlreadyFailed = null,
     firstScheduledRoot = null,
     lastScheduledRoot = null,
     callbackExpirationTime = 0,
@@ -5226,6 +5503,7 @@ function ReactFiberScheduler(config) {
     nestedUpdateCount = 0,
     timeHeuristicForUnitOfWork = 1;
   return {
+    recalculateCurrentTime: recalculateCurrentTime,
     computeExpirationForFiber: computeExpirationForFiber,
     scheduleWork: scheduleWork,
     requestWork: requestWork,
@@ -5234,7 +5512,10 @@ function ReactFiberScheduler(config) {
         !isRendering,
         "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
       );
+      nextFlushedRoot = root;
+      nextFlushedExpirationTime = expirationTime;
       performWorkOnRoot(root, expirationTime, !1);
+      performSyncWork();
       finishRendering();
     },
     batchedUpdates: function(fn, a) {
@@ -5245,7 +5526,7 @@ function ReactFiberScheduler(config) {
       } finally {
         (isBatchingUpdates = previousIsBatchingUpdates) ||
           isRendering ||
-          performWork(1, !1, null);
+          performSyncWork();
       }
     },
     unbatchedUpdates: function(fn, a) {
@@ -5269,8 +5550,7 @@ function ReactFiberScheduler(config) {
       try {
         return syncUpdates(fn, a);
       } finally {
-        (isBatchingUpdates = previousIsBatchingUpdates),
-          performWork(1, !1, null);
+        (isBatchingUpdates = previousIsBatchingUpdates), performSyncWork();
       }
     },
     flushControlled: function(fn) {
@@ -5286,7 +5566,8 @@ function ReactFiberScheduler(config) {
     },
     deferredUpdates: function(fn) {
       var previousExpirationContext = expirationContext;
-      expirationContext = computeAsyncExpiration();
+      expirationContext =
+        25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1);
       try {
         return fn();
       } finally {
@@ -5310,7 +5591,7 @@ function ReactFiberScheduler(config) {
         (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
           (isBatchingUpdates = previousIsBatchingUpdates) ||
             isRendering ||
-            performWork(1, !1, null);
+            performSyncWork();
       }
     },
     flushInteractiveUpdates: function() {
@@ -5320,11 +5601,12 @@ function ReactFiberScheduler(config) {
         (lowestPendingInteractiveExpirationTime = 0));
     },
     computeUniqueAsyncExpiration: function() {
-      var result = computeAsyncExpiration();
+      var result = 25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1);
       result <= lastUniqueAsyncExpiration &&
         (result = lastUniqueAsyncExpiration + 1);
       return (lastUniqueAsyncExpiration = result);
-    }
+    },
+    legacyContext: legacyContext
   };
 }
 function ReactFiberReconciler$1(config) {
@@ -5332,33 +5614,14 @@ function ReactFiberReconciler$1(config) {
     element,
     container,
     parentComponent,
+    currentTime,
     expirationTime,
     callback
   ) {
-    var current = container.current;
+    currentTime = container.current;
     if (parentComponent) {
       parentComponent = parentComponent._reactInternalFiber;
-      var parentContext;
-      b: {
-        invariant(
-          2 === isFiberMountedImpl(parentComponent) &&
-            2 === parentComponent.tag,
-          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-        );
-        for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
-          if (isContextProvider(parentContext)) {
-            parentContext =
-              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
-            break b;
-          }
-          parentContext = parentContext["return"];
-          invariant(
-            parentContext,
-            "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-          );
-        }
-        parentContext = parentContext.stateNode.context;
-      }
+      var parentContext = findCurrentUnmaskedContext(parentComponent);
       parentComponent = isContextProvider(parentComponent)
         ? processChildContext(parentComponent, parentContext)
         : parentContext;
@@ -5367,15 +5630,16 @@ function ReactFiberReconciler$1(config) {
       ? (container.context = parentComponent)
       : (container.pendingContext = parentComponent);
     container = callback;
-    insertUpdateIntoFiber(current, {
+    insertUpdateIntoFiber(currentTime, {
       expirationTime: expirationTime,
       partialState: { element: element },
       callback: void 0 === container ? null : container,
       isReplace: !1,
       isForced: !1,
+      capturedValue: null,
       next: null
     });
-    scheduleWork(current, expirationTime);
+    scheduleWork(currentTime, expirationTime);
     return expirationTime;
   }
   function findHostInstance(fiber) {
@@ -5384,8 +5648,13 @@ function ReactFiberReconciler$1(config) {
   }
   var getPublicInstance = config.getPublicInstance;
   config = ReactFiberScheduler(config);
-  var computeExpirationForFiber = config.computeExpirationForFiber,
-    scheduleWork = config.scheduleWork;
+  var recalculateCurrentTime = config.recalculateCurrentTime,
+    computeExpirationForFiber = config.computeExpirationForFiber,
+    scheduleWork = config.scheduleWork,
+    legacyContext = config.legacyContext,
+    findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
   return {
     createContainer: function(containerInfo, isAsync, hydrate) {
       isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
@@ -5393,28 +5662,47 @@ function ReactFiberReconciler$1(config) {
         current: isAsync,
         containerInfo: containerInfo,
         pendingChildren: null,
-        remainingExpirationTime: 0,
-        isReadyForCommit: !1,
+        pendingCommitExpirationTime: 0,
         finishedWork: null,
         context: null,
         pendingContext: null,
         hydrate: hydrate,
+        remainingExpirationTime: 0,
         firstBatch: null,
         nextScheduledRoot: null
       };
       return (isAsync.stateNode = containerInfo);
     },
     updateContainer: function(element, container, parentComponent, callback) {
-      var expirationTime = computeExpirationForFiber(container.current);
+      var current = container.current,
+        currentTime = recalculateCurrentTime();
+      current = computeExpirationForFiber(current);
+      return updateContainerAtExpirationTime(
+        element,
+        container,
+        parentComponent,
+        currentTime,
+        current,
+        callback
+      );
+    },
+    updateContainerAtExpirationTime: function(
+      element,
+      container,
+      parentComponent,
+      expirationTime,
+      callback
+    ) {
+      var currentTime = recalculateCurrentTime();
       return updateContainerAtExpirationTime(
         element,
         container,
         parentComponent,
+        currentTime,
         expirationTime,
         callback
       );
     },
-    updateContainerAtExpirationTime: updateContainerAtExpirationTime,
     flushRoot: config.flushRoot,
     requestWork: config.requestWork,
     computeUniqueAsyncExpiration: config.computeUniqueAsyncExpiration,
@@ -5465,6 +5753,27 @@ var ReactFiberReconciler$2 = Object.freeze({ default: ReactFiberReconciler$1 }),
   reactReconciler = ReactFiberReconciler$3["default"]
     ? ReactFiberReconciler$3["default"]
     : ReactFiberReconciler$3,
+  ReactNativeTagHandles = {
+    tagsStartAt: 1,
+    tagCount: 1,
+    allocateTag: function() {
+      for (; this.reactTagIsNativeTopRootID(ReactNativeTagHandles.tagCount); )
+        ReactNativeTagHandles.tagCount++;
+      var tag = ReactNativeTagHandles.tagCount;
+      ReactNativeTagHandles.tagCount++;
+      return tag;
+    },
+    assertRootTag: function(tag) {
+      invariant(
+        this.reactTagIsNativeTopRootID(tag),
+        "Expect a native root tag, instead got %s",
+        tag
+      );
+    },
+    reactTagIsNativeTopRootID: function(reactTag) {
+      return 1 === reactTag % 10;
+    }
+  },
   ReactFabricHostComponent = (function() {
     function ReactFabricHostComponent(tag, viewConfig, props) {
       if (!(this instanceof ReactFabricHostComponent))
@@ -5685,7 +5994,28 @@ var roots = new Map(),
         2 < arguments.length && void 0 !== arguments[2] ? arguments[2] : null
       );
     },
-    unstable_batchedUpdates: batchedUpdates,
+    unstable_batchedUpdates: function(fn, bookkeeping) {
+      if (isBatching) return fn(bookkeeping);
+      isBatching = !0;
+      try {
+        return _batchedUpdates(fn, bookkeeping);
+      } finally {
+        if (
+          ((isBatching = !1), null !== restoreTarget || null !== restoreQueue)
+        )
+          if (
+            (_flushInteractiveUpdates(),
+            restoreTarget &&
+              ((bookkeeping = restoreTarget),
+              (fn = restoreQueue),
+              (restoreQueue = restoreTarget = null),
+              restoreStateOfTarget(bookkeeping),
+              fn))
+          )
+            for (bookkeeping = 0; bookkeeping < fn.length; bookkeeping++)
+              restoreStateOfTarget(fn[bookkeeping]);
+      }
+    },
     flushSync: ReactFabricRenderer.flushSync,
     __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
       NativeMethodsMixin: {
@@ -5738,7 +6068,6 @@ var roots = new Map(),
         }
       },
       ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin,
-      ReactGlobalSharedState: ReactGlobalSharedState,
       ReactNativeComponentTree: ReactNativeComponentTree,
       ReactNativePropRegistry: ReactNativePropRegistry,
       TouchHistoryMath: TouchHistoryMath,
@@ -5763,7 +6092,7 @@ ReactFabricRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.0-alpha.0",
+  version: "16.3.1",
   rendererPackageName: "react-native-renderer"
 });
 var ReactFabric$2 = Object.freeze({ default: ReactFabric }),
diff --git a/Libraries/Renderer/ReactNativeRenderer-dev.js b/Libraries/Renderer/ReactNativeRenderer-dev.js
index 15ee4136d11ae6..7fd62f11ca6ae4 100644
--- a/Libraries/Renderer/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/ReactNativeRenderer-dev.js
@@ -19,16 +19,16 @@ require("InitializeCore");
 var invariant = require("fbjs/lib/invariant");
 var warning = require("fbjs/lib/warning");
 var emptyFunction = require("fbjs/lib/emptyFunction");
-var RCTEventEmitter = require("RCTEventEmitter");
 var UIManager = require("UIManager");
-var React = require("react");
+var RCTEventEmitter = require("RCTEventEmitter");
 var TextInputState = require("TextInputState");
 var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
+var React = require("react");
 var emptyObject = require("fbjs/lib/emptyObject");
-var checkPropTypes = require("prop-types/checkPropTypes");
 var shallowEqual = require("fbjs/lib/shallowEqual");
 var ExceptionsManager = require("ExceptionsManager");
+var checkPropTypes = require("prop-types/checkPropTypes");
 var deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev");
 
 var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
@@ -510,11 +510,13 @@ var injection$1 = {
     getNodeFromInstance = Injected.getNodeFromInstance;
 
     {
-      warning(
-        getNodeFromInstance && getInstanceFromNode,
-        "EventPluginUtils.injection.injectComponentTree(...): Injected " +
-          "module is missing getNodeFromInstance or getInstanceFromNode."
-      );
+      !(getNodeFromInstance && getInstanceFromNode)
+        ? warning(
+            false,
+            "EventPluginUtils.injection.injectComponentTree(...): Injected " +
+              "module is missing getNodeFromInstance or getInstanceFromNode."
+          )
+        : void 0;
     }
   }
 };
@@ -550,10 +552,9 @@ var validateEventDispatches = void 0;
       ? dispatchInstances.length
       : dispatchInstances ? 1 : 0;
 
-    warning(
-      instancesIsArr === listenersIsArr && instancesLen === listenersLen,
-      "EventPluginUtils: Invalid `event`."
-    );
+    !(instancesIsArr === listenersIsArr && instancesLen === listenersLen)
+      ? warning(false, "EventPluginUtils: Invalid `event`.")
+      : void 0;
   };
 }
 
@@ -965,6 +966,7 @@ var Fragment = 10;
 var Mode = 11;
 var ContextConsumer = 12;
 var ContextProvider = 13;
+var ForwardRef = 14;
 
 function getParent(inst) {
   do {
@@ -1093,7 +1095,7 @@ function listenerAtPhase(inst, event, propagationPhase) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   {
-    warning(inst, "Dispatching inst must not be null");
+    !inst ? warning(false, "Dispatching inst must not be null") : void 0;
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
@@ -1412,13 +1414,15 @@ SyntheticEvent.extend = function(Interface) {
               !target.constructor.Interface.hasOwnProperty(prop) &&
               shouldBeReleasedProperties.indexOf(prop) === -1
             ) {
-              warning(
-                didWarnForAddedNewProperty || target.isPersistent(),
-                "This synthetic event is reused for performance reasons. If you're " +
-                  "seeing this, you're adding a new property in the synthetic event object. " +
-                  "The property is never released. See " +
-                  "https://fb.me/react-event-pooling for more information."
-              );
+              !(didWarnForAddedNewProperty || target.isPersistent())
+                ? warning(
+                    false,
+                    "This synthetic event is reused for performance reasons. If you're " +
+                      "seeing this, you're adding a new property in the synthetic event object. " +
+                      "The property is never released. See " +
+                      "https://fb.me/react-event-pooling for more information."
+                  )
+                : void 0;
               didWarnForAddedNewProperty = true;
             }
             target[prop] = value;
@@ -1465,16 +1469,18 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function warn(action, result) {
     var warningCondition = false;
-    warning(
-      warningCondition,
-      "This synthetic event is reused for performance reasons. If you're seeing this, " +
-        "you're %s `%s` on a released/nullified synthetic event. %s. " +
-        "If you must keep the original synthetic event around, use event.persist(). " +
-        "See https://fb.me/react-event-pooling for more information.",
-      action,
-      propName,
-      result
-    );
+    !warningCondition
+      ? warning(
+          false,
+          "This synthetic event is reused for performance reasons. If you're seeing this, " +
+            "you're %s `%s` on a released/nullified synthetic event. %s. " +
+            "If you must keep the original synthetic event around, use event.persist(). " +
+            "See https://fb.me/react-event-pooling for more information.",
+          action,
+          propName,
+          result
+        )
+      : void 0;
   }
 }
 
@@ -1592,13 +1598,15 @@ function getTouchIdentifier(_ref) {
 
   invariant(identifier != null, "Touch object is missing identifier.");
   {
-    warning(
-      identifier <= MAX_TOUCH_BANK,
-      "Touch identifier %s is greater than maximum supported %s which causes " +
-        "performance issues backfilling array locations for all of the indices.",
-      identifier,
-      MAX_TOUCH_BANK
-    );
+    !(identifier <= MAX_TOUCH_BANK)
+      ? warning(
+          false,
+          "Touch identifier %s is greater than maximum supported %s which causes " +
+            "performance issues backfilling array locations for all of the indices.",
+          identifier,
+          MAX_TOUCH_BANK
+        )
+      : void 0;
   }
   return identifier;
 }
@@ -1697,10 +1705,9 @@ var ResponderTouchHistoryStore = {
         }
         {
           var activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
-          warning(
-            activeRecord != null && activeRecord.touchActive,
-            "Cannot find single active touch."
-          );
+          !(activeRecord != null && activeRecord.touchActive)
+            ? warning(false, "Cannot find single active touch.")
+            : void 0;
         }
       }
     }
@@ -2323,6 +2330,10 @@ var ReactNativeBridgeEventPlugin = {
     nativeEvent,
     nativeEventTarget
   ) {
+    if (targetInst == null) {
+      // Probably a node belonging to another renderer's tree.
+      return null;
+    }
     var bubbleDispatchConfig = customBubblingEventTypes[topLevelType];
     var directDispatchConfig = customDirectEventTypes[topLevelType];
     invariant(
@@ -2434,6 +2445,49 @@ var ReactNativeComponentTree = Object.freeze({
   updateFiberProps: updateFiberProps
 });
 
+var ReactNativeEventPluginOrder = [
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+];
+
+// Module provided by RN:
+var ReactNativeGlobalResponderHandler = {
+  onChange: function(from, to, blockNativeResponder) {
+    if (to !== null) {
+      var tag = to.stateNode._nativeTag;
+      UIManager.setJSResponder(tag, blockNativeResponder);
+    } else {
+      UIManager.clearJSResponder();
+    }
+  }
+};
+
+/**
+ * Make sure essential globals are available and are patched correctly. Please don't remove this
+ * line. Bundles created by react-packager `require` it before executing any application code. This
+ * ensures it exists in the dependency graph and can be `require`d.
+ * TODO: require this in packager, not in React #10932517
+ */
+// Module provided by RN:
+/**
+ * Inject module for resolving DOM hierarchy and plugin ordering.
+ */
+injection.injectEventPluginOrder(ReactNativeEventPluginOrder);
+injection$1.injectComponentTree(ReactNativeComponentTree);
+
+ResponderEventPlugin.injection.injectGlobalResponderHandler(
+  ReactNativeGlobalResponderHandler
+);
+
+/**
+ * Some important event plugins included by default (without having to require
+ * them).
+ */
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+});
+
 // Use to restore controlled state after a change event has fired.
 
 var fiberHostComponent = null;
@@ -2732,55 +2786,12 @@ var ReactNativeEventEmitter = Object.freeze({
   receiveTouches: receiveTouches
 });
 
-var ReactNativeEventPluginOrder = [
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-];
-
-// Module provided by RN:
-var ReactNativeGlobalResponderHandler = {
-  onChange: function(from, to, blockNativeResponder) {
-    if (to !== null) {
-      var tag = to.stateNode._nativeTag;
-      UIManager.setJSResponder(tag, blockNativeResponder);
-    } else {
-      UIManager.clearJSResponder();
-    }
-  }
-};
-
-/**
- * Make sure essential globals are available and are patched correctly. Please don't remove this
- * line. Bundles created by react-packager `require` it before executing any application code. This
- * ensures it exists in the dependency graph and can be `require`d.
- * TODO: require this in packager, not in React #10932517
- */
-// Module provided by RN:
 // Module provided by RN:
 /**
  * Register the event emitter with the native bridge
  */
 RCTEventEmitter.register(ReactNativeEventEmitter);
 
-/**
- * Inject module for resolving DOM hierarchy and plugin ordering.
- */
-injection.injectEventPluginOrder(ReactNativeEventPluginOrder);
-injection$1.injectComponentTree(ReactNativeComponentTree);
-
-ResponderEventPlugin.injection.injectGlobalResponderHandler(
-  ReactNativeGlobalResponderHandler
-);
-
-/**
- * Some important event plugins included by default (without having to require
- * them).
- */
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
-});
-
 // The Symbol used to tag the ReactElement-like types. If there is no native Symbol
 // nor polyfill, then a plain number is used for performance.
 var hasSymbol = typeof Symbol === "function" && Symbol["for"];
@@ -2798,6 +2809,9 @@ var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
 var REACT_ASYNC_MODE_TYPE = hasSymbol
   ? Symbol["for"]("react.async_mode")
   : 0xeacf;
+var REACT_FORWARD_REF_TYPE = hasSymbol
+  ? Symbol["for"]("react.forward_ref")
+  : 0xead0;
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
 var FAUX_ITERATOR_SYMBOL = "@@iterator";
@@ -2977,19 +2991,9 @@ var TouchHistoryMath = {
   noCentroid: -1
 };
 
-var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-var ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
-var ReactDebugCurrentFrame = ReactInternals.ReactDebugCurrentFrame;
-
-var ReactGlobalSharedState = Object.freeze({
-  ReactCurrentOwner: ReactCurrentOwner,
-  ReactDebugCurrentFrame: ReactDebugCurrentFrame
-});
-
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.0-alpha.0";
+var ReactVersion = "16.3.1";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -3580,6 +3584,11 @@ function set(key, value) {
   key._reactInternalFiber = value;
 }
 
+var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+var ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
+var ReactDebugCurrentFrame = ReactInternals.ReactDebugCurrentFrame;
+
 function getComponentName(fiber) {
   var type = fiber.type;
 
@@ -3654,15 +3663,17 @@ function findNodeHandle(componentOrHandle) {
   {
     var owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
-      warning(
-        owner.stateNode._warnedAboutRefsInRender,
-        "%s is accessing findNodeHandle inside its render(). " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(owner) || "A component"
-      );
+      !owner.stateNode._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing findNodeHandle inside its render(). " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(owner) || "A component"
+          )
+        : void 0;
 
       owner.stateNode._warnedAboutRefsInRender = true;
     }
@@ -3881,6 +3892,8 @@ var NativeMethodsMixin = {
       !NativeMethodsMixin_DEV.UNSAFE_componentWillReceiveProps,
     "Do not override existing functions."
   );
+  // TODO (bvaughn) Remove cWM and cWRP in a future version of React Native,
+  // Once these lifecycles have been remove from the reconciler.
   NativeMethodsMixin_DEV.componentWillMount = function() {
     throwOnStylesProp(this, this.props);
   };
@@ -3893,6 +3906,12 @@ var NativeMethodsMixin = {
   NativeMethodsMixin_DEV.UNSAFE_componentWillReceiveProps = function(newProps) {
     throwOnStylesProp(this, newProps);
   };
+
+  // React may warn about cWM/cWRP/cWU methods being deprecated.
+  // Add a flag to suppress these warnings for this special case.
+  // TODO (bvaughn) Remove this flag once the above methods have been removed.
+  NativeMethodsMixin_DEV.componentWillMount.__suppressDeprecationWarning = true;
+  NativeMethodsMixin_DEV.componentWillReceiveProps.__suppressDeprecationWarning = true;
 }
 
 function _classCallCheck$1(instance, Constructor) {
@@ -3961,6 +3980,11 @@ var ReactNativeComponent = (function(_React$Component) {
   /**
    * Removes focus. This is the opposite of `focus()`.
    */
+
+  /**
+   * Due to bugs in Flow's handling of React.createClass, some fields already
+   * declared in the base class need to be redeclared below.
+   */
   ReactNativeComponent.prototype.blur = function blur() {
     TextInputState.blurTextInput(findNumericNodeHandleFiber(this));
   };
@@ -4090,19 +4114,27 @@ var ReactNativeComponent = (function(_React$Component) {
   return ReactNativeComponent;
 })(React.Component);
 
-// Don't change these two values:
-var NoEffect = 0;
-var PerformedWork = 1;
+// Don't change these two values. They're used by React Dev Tools.
+var NoEffect = /*              */ 0;
+var PerformedWork = /*         */ 1;
 
 // You can change the rest (and add more).
-var Placement = 2;
-var Update = 4;
-var PlacementAndUpdate = 6;
-var Deletion = 8;
-var ContentReset = 16;
-var Callback = 32;
-var Err = 64;
-var Ref = 128;
+var Placement = /*             */ 2;
+var Update = /*                */ 4;
+var PlacementAndUpdate = /*    */ 6;
+var Deletion = /*              */ 8;
+var ContentReset = /*          */ 16;
+var Callback = /*              */ 32;
+var DidCapture = /*            */ 64;
+var Ref = /*                   */ 128;
+var ErrLog = /*                */ 256;
+var Snapshot = /*              */ 2048;
+
+// Union of all host effects
+var HostEffectMask = /*        */ 2559;
+
+var Incomplete = /*            */ 512;
+var ShouldCapture = /*         */ 1024;
 
 var MOUNTING = 1;
 var MOUNTED = 2;
@@ -4147,15 +4179,17 @@ function isMounted(component) {
     if (owner !== null && owner.tag === ClassComponent) {
       var ownerFiber = owner;
       var instance = ownerFiber.stateNode;
-      warning(
-        instance._warnedAboutRefsInRender,
-        "%s is accessing isMounted inside its render() function. " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(ownerFiber) || "A component"
-      );
+      !instance._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing isMounted inside its render() function. " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(ownerFiber) || "A component"
+          )
+        : void 0;
       instance._warnedAboutRefsInRender = true;
     }
   }
@@ -4366,1643 +4400,1393 @@ function findCurrentHostFiberWithNoPortals(parent) {
   return null;
 }
 
-var valueStack = [];
+// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
+// Math.pow(2, 30) - 1
+// 0b111111111111111111111111111111
+var MAX_SIGNED_31_BIT_INT = 1073741823;
 
-var fiberStack = void 0;
+// TODO: Use an opaque type once ESLint et al support the syntax
 
-{
-  fiberStack = [];
-}
+var NoWork = 0;
+var Sync = 1;
+var Never = MAX_SIGNED_31_BIT_INT;
 
-var index = -1;
+var UNIT_SIZE = 10;
+var MAGIC_NUMBER_OFFSET = 2;
 
-function createCursor(defaultValue) {
-  return {
-    current: defaultValue
-  };
+// 1 unit of expiration time represents 10ms.
+function msToExpirationTime(ms) {
+  // Always add an offset so that we don't clash with the magic number for NoWork.
+  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
 }
 
-function pop(cursor, fiber) {
-  if (index < 0) {
-    {
-      warning(false, "Unexpected pop.");
-    }
-    return;
-  }
+function expirationTimeToMs(expirationTime) {
+  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
+}
 
-  {
-    if (fiber !== fiberStack[index]) {
-      warning(false, "Unexpected Fiber popped.");
-    }
-  }
+function ceiling(num, precision) {
+  return (((num / precision) | 0) + 1) * precision;
+}
+
+function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
+  return ceiling(
+    currentTime + expirationInMs / UNIT_SIZE,
+    bucketSizeMs / UNIT_SIZE
+  );
+}
 
-  cursor.current = valueStack[index];
+var NoContext = 0;
+var AsyncMode = 1;
+var StrictMode = 2;
 
-  valueStack[index] = null;
+var hasBadMapPolyfill = void 0;
 
-  {
-    fiberStack[index] = null;
+{
+  hasBadMapPolyfill = false;
+  try {
+    var nonExtensibleObject = Object.preventExtensions({});
+    var testMap = new Map([[nonExtensibleObject, null]]);
+    var testSet = new Set([nonExtensibleObject]);
+    // This is necessary for Rollup to not consider these unused.
+    // https://github.com/rollup/rollup/issues/1771
+    // TODO: we can remove these if Rollup fixes the bug.
+    testMap.set(0, 0);
+    testSet.add(0);
+  } catch (e) {
+    // TODO: Consider warning about bad polyfills
+    hasBadMapPolyfill = true;
   }
+}
+
+// A Fiber is work on a Component that needs to be done or was done. There can
+// be more than one per component.
+
+var debugCounter = void 0;
 
-  index--;
+{
+  debugCounter = 1;
 }
 
-function push(cursor, value, fiber) {
-  index++;
+function FiberNode(tag, pendingProps, key, mode) {
+  // Instance
+  this.tag = tag;
+  this.key = key;
+  this.type = null;
+  this.stateNode = null;
 
-  valueStack[index] = cursor.current;
+  // Fiber
+  this["return"] = null;
+  this.child = null;
+  this.sibling = null;
+  this.index = 0;
 
-  {
-    fiberStack[index] = fiber;
-  }
+  this.ref = null;
 
-  cursor.current = value;
-}
+  this.pendingProps = pendingProps;
+  this.memoizedProps = null;
+  this.updateQueue = null;
+  this.memoizedState = null;
 
-function reset() {
-  while (index > -1) {
-    valueStack[index] = null;
+  this.mode = mode;
 
-    {
-      fiberStack[index] = null;
-    }
+  // Effects
+  this.effectTag = NoEffect;
+  this.nextEffect = null;
 
-    index--;
+  this.firstEffect = null;
+  this.lastEffect = null;
+
+  this.expirationTime = NoWork;
+
+  this.alternate = null;
+
+  {
+    this._debugID = debugCounter++;
+    this._debugSource = null;
+    this._debugOwner = null;
+    this._debugIsCurrentlyTiming = false;
+    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
+      Object.preventExtensions(this);
+    }
   }
 }
 
-var describeComponentFrame = function(name, source, ownerName) {
-  return (
-    "\n    in " +
-    (name || "Unknown") +
-    (source
-      ? " (at " +
-        source.fileName.replace(/^.*[\\\/]/, "") +
-        ":" +
-        source.lineNumber +
-        ")"
-      : ownerName ? " (created by " + ownerName + ")" : "")
-  );
-};
-
-function describeFiber(fiber) {
-  switch (fiber.tag) {
-    case IndeterminateComponent:
-    case FunctionalComponent:
-    case ClassComponent:
-    case HostComponent:
-      var owner = fiber._debugOwner;
-      var source = fiber._debugSource;
-      var name = getComponentName(fiber);
-      var ownerName = null;
-      if (owner) {
-        ownerName = getComponentName(owner);
-      }
-      return describeComponentFrame(name, source, ownerName);
-    default:
-      return "";
+// This is a constructor function, rather than a POJO constructor, still
+// please ensure we do the following:
+// 1) Nobody should add any instance methods on this. Instance methods can be
+//    more difficult to predict when they get optimized and they are almost
+//    never inlined properly in static compilers.
+// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
+//    always know when it is a fiber.
+// 3) We might want to experiment with using numeric keys since they are easier
+//    to optimize in a non-JIT environment.
+// 4) We can easily go from a constructor to a createFiber object literal if that
+//    is faster.
+// 5) It should be easy to port this to a C struct and keep a C implementation
+//    compatible.
+var createFiber = function(tag, pendingProps, key, mode) {
+  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
+  return new FiberNode(tag, pendingProps, key, mode);
+};
+
+function shouldConstruct(Component) {
+  return !!(Component.prototype && Component.prototype.isReactComponent);
+}
+
+// This is used to create an alternate fiber to do work on.
+function createWorkInProgress(current, pendingProps, expirationTime) {
+  var workInProgress = current.alternate;
+  if (workInProgress === null) {
+    // We use a double buffering pooling technique because we know that we'll
+    // only ever need at most two versions of a tree. We pool the "other" unused
+    // node that we're free to reuse. This is lazily created to avoid allocating
+    // extra objects for things that are never updated. It also allow us to
+    // reclaim the extra memory if needed.
+    workInProgress = createFiber(
+      current.tag,
+      pendingProps,
+      current.key,
+      current.mode
+    );
+    workInProgress.type = current.type;
+    workInProgress.stateNode = current.stateNode;
+
+    {
+      // DEV-only fields
+      workInProgress._debugID = current._debugID;
+      workInProgress._debugSource = current._debugSource;
+      workInProgress._debugOwner = current._debugOwner;
+    }
+
+    workInProgress.alternate = current;
+    current.alternate = workInProgress;
+  } else {
+    workInProgress.pendingProps = pendingProps;
+
+    // We already have an alternate.
+    // Reset the effect tag.
+    workInProgress.effectTag = NoEffect;
+
+    // The effect list is no longer valid.
+    workInProgress.nextEffect = null;
+    workInProgress.firstEffect = null;
+    workInProgress.lastEffect = null;
   }
+
+  workInProgress.expirationTime = expirationTime;
+
+  workInProgress.child = current.child;
+  workInProgress.memoizedProps = current.memoizedProps;
+  workInProgress.memoizedState = current.memoizedState;
+  workInProgress.updateQueue = current.updateQueue;
+
+  // These will be overridden during the parent's reconciliation
+  workInProgress.sibling = current.sibling;
+  workInProgress.index = current.index;
+  workInProgress.ref = current.ref;
+
+  return workInProgress;
 }
 
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  var node = workInProgress;
-  do {
-    info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
-    node = node["return"];
-  } while (node);
-  return info;
+function createHostRootFiber(isAsync) {
+  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
+  return createFiber(HostRoot, null, null, mode);
 }
 
-function getCurrentFiberOwnerName() {
+function createFiberFromElement(element, mode, expirationTime) {
+  var owner = null;
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    var owner = fiber._debugOwner;
-    if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner);
+    owner = element._owner;
+  }
+
+  var fiber = void 0;
+  var type = element.type;
+  var key = element.key;
+  var pendingProps = element.props;
+
+  var fiberTag = void 0;
+  if (typeof type === "function") {
+    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
+  } else if (typeof type === "string") {
+    fiberTag = HostComponent;
+  } else {
+    switch (type) {
+      case REACT_FRAGMENT_TYPE:
+        return createFiberFromFragment(
+          pendingProps.children,
+          mode,
+          expirationTime,
+          key
+        );
+      case REACT_ASYNC_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= AsyncMode | StrictMode;
+        break;
+      case REACT_STRICT_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= StrictMode;
+        break;
+      case REACT_CALL_TYPE:
+        fiberTag = CallComponent;
+        break;
+      case REACT_RETURN_TYPE:
+        fiberTag = ReturnComponent;
+        break;
+      default: {
+        if (typeof type === "object" && type !== null) {
+          switch (type.$$typeof) {
+            case REACT_PROVIDER_TYPE:
+              fiberTag = ContextProvider;
+              break;
+            case REACT_CONTEXT_TYPE:
+              // This is a consumer
+              fiberTag = ContextConsumer;
+              break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = ForwardRef;
+              break;
+            default:
+              if (typeof type.tag === "number") {
+                // Currently assumed to be a continuation and therefore is a
+                // fiber already.
+                // TODO: The yield system is currently broken for updates in
+                // some cases. The reified yield stores a fiber, but we don't
+                // know which fiber that is; the current or a workInProgress?
+                // When the continuation gets rendered here we don't know if we
+                // can reuse that fiber or if we need to clone it. There is
+                // probably a clever way to restructure this.
+                fiber = type;
+                fiber.pendingProps = pendingProps;
+                fiber.expirationTime = expirationTime;
+                return fiber;
+              } else {
+                throwOnInvalidElementType(type, owner);
+              }
+              break;
+          }
+        } else {
+          throwOnInvalidElementType(type, owner);
+        }
+      }
     }
   }
-  return null;
+
+  fiber = createFiber(fiberTag, pendingProps, key, mode);
+  fiber.type = type;
+  fiber.expirationTime = expirationTime;
+
+  {
+    fiber._debugSource = element._source;
+    fiber._debugOwner = element._owner;
+  }
+
+  return fiber;
 }
 
-function getCurrentFiberStackAddendum() {
+function throwOnInvalidElementType(type, owner) {
+  var info = "";
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
+    if (
+      type === undefined ||
+      (typeof type === "object" &&
+        type !== null &&
+        Object.keys(type).length === 0)
+    ) {
+      info +=
+        " You likely forgot to export your component from the file " +
+        "it's defined in, or you might have mixed up default and " +
+        "named imports.";
+    }
+    var ownerName = owner ? getComponentName(owner) : null;
+    if (ownerName) {
+      info += "\n\nCheck the render method of `" + ownerName + "`.";
     }
-    // Safe because if current fiber exists, we are reconciling,
-    // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
   }
-  return null;
+  invariant(
+    false,
+    "Element type is invalid: expected a string (for built-in " +
+      "components) or a class/function (for composite components) " +
+      "but got: %s.%s",
+    type == null ? type : typeof type,
+    info
+  );
 }
 
-function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
+function createFiberFromFragment(elements, mode, expirationTime, key) {
+  var fiber = createFiber(Fragment, elements, key, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function setCurrentFiber(fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
+function createFiberFromText(content, mode, expirationTime) {
+  var fiber = createFiber(HostText, content, null, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function setCurrentPhase(phase) {
-  ReactDebugCurrentFiber.phase = phase;
+function createFiberFromHostInstanceForDeletion() {
+  var fiber = createFiber(HostComponent, null, null, NoContext);
+  fiber.type = "DELETED";
+  return fiber;
 }
 
-var ReactDebugCurrentFiber = {
-  current: null,
-  phase: null,
-  resetCurrentFiber: resetCurrentFiber,
-  setCurrentFiber: setCurrentFiber,
-  setCurrentPhase: setCurrentPhase,
-  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
-};
-
-// Re-export dynamic flags from the fbsource version.
-var _require = require("ReactFeatureFlags");
-
-var debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects;
-var debugRenderPhaseSideEffectsForStrictMode =
-  _require.debugRenderPhaseSideEffectsForStrictMode;
-var warnAboutDeprecatedLifecycles = _require.warnAboutDeprecatedLifecycles;
-
-var enableUserTimingAPI = true;
-var enableMutatingReconciler = true;
-var enableNoopReconciler = false;
-var enablePersistentReconciler = false;
-
-// Only used in www builds.
-
-// Prefix measurements so that it's possible to filter them.
-// Longer prefixes are hard to read in DevTools.
-var reactEmoji = "\u269B";
-var warningEmoji = "\u26D4";
-var supportsUserTiming =
-  typeof performance !== "undefined" &&
-  typeof performance.mark === "function" &&
-  typeof performance.clearMarks === "function" &&
-  typeof performance.measure === "function" &&
-  typeof performance.clearMeasures === "function";
+function createFiberFromPortal(portal, mode, expirationTime) {
+  var pendingProps = portal.children !== null ? portal.children : [];
+  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
+  fiber.expirationTime = expirationTime;
+  fiber.stateNode = {
+    containerInfo: portal.containerInfo,
+    pendingChildren: null, // Used by persistent updates
+    implementation: portal.implementation
+  };
+  return fiber;
+}
 
-// Keep track of current fiber so that we know the path to unwind on pause.
-// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
-var currentFiber = null;
-// If we're in the middle of user code, which fiber and method is it?
-// Reusing `currentFiber` would be confusing for this because user code fiber
-// can change during commit phase too, but we don't need to unwind it (since
-// lifecycles in the commit phase don't resemble a tree).
-var currentPhase = null;
-var currentPhaseFiber = null;
-// Did lifecycle hook schedule an update? This is often a performance problem,
-// so we will keep track of it, and include it in the report.
-// Track commits caused by cascading updates.
-var isCommitting = false;
-var hasScheduledUpdateInCurrentCommit = false;
-var hasScheduledUpdateInCurrentPhase = false;
-var commitCountInCurrentWorkLoop = 0;
-var effectCountInCurrentCommit = 0;
-var isWaitingForCallback = false;
-// During commits, we only show a measurement once per method name
-// to avoid stretch the commit phase with measurement overhead.
-var labelsInCurrentCommit = new Set();
+// Used for stashing WIP properties to replay failed work in DEV.
+function assignFiberPropertiesInDEV(target, source) {
+  if (target === null) {
+    // This Fiber's initial properties will always be overwritten.
+    // We only use a Fiber to ensure the same hidden class so DEV isn't slow.
+    target = createFiber(IndeterminateComponent, null, null, NoContext);
+  }
+
+  // This is intentionally written as a list of all properties.
+  // We tried to use Object.assign() instead but this is called in
+  // the hottest path, and Object.assign() was too slow:
+  // https://github.com/facebook/react/issues/12502
+  // This code is DEV-only so size is not a concern.
+
+  target.tag = source.tag;
+  target.key = source.key;
+  target.type = source.type;
+  target.stateNode = source.stateNode;
+  target["return"] = source["return"];
+  target.child = source.child;
+  target.sibling = source.sibling;
+  target.index = source.index;
+  target.ref = source.ref;
+  target.pendingProps = source.pendingProps;
+  target.memoizedProps = source.memoizedProps;
+  target.updateQueue = source.updateQueue;
+  target.memoizedState = source.memoizedState;
+  target.mode = source.mode;
+  target.effectTag = source.effectTag;
+  target.nextEffect = source.nextEffect;
+  target.firstEffect = source.firstEffect;
+  target.lastEffect = source.lastEffect;
+  target.expirationTime = source.expirationTime;
+  target.alternate = source.alternate;
+  target._debugID = source._debugID;
+  target._debugSource = source._debugSource;
+  target._debugOwner = source._debugOwner;
+  target._debugIsCurrentlyTiming = source._debugIsCurrentlyTiming;
+  return target;
+}
 
-var formatMarkName = function(markName) {
-  return reactEmoji + " " + markName;
-};
+// TODO: This should be lifted into the renderer.
 
-var formatLabel = function(label, warning$$1) {
-  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
-  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
-  return "" + prefix + label + suffix;
-};
+function createFiberRoot(containerInfo, isAsync, hydrate) {
+  // Cyclic construction. This cheats the type system right now because
+  // stateNode is any.
+  var uninitializedFiber = createHostRootFiber(isAsync);
+  var root = {
+    current: uninitializedFiber,
+    containerInfo: containerInfo,
+    pendingChildren: null,
+    pendingCommitExpirationTime: NoWork,
+    finishedWork: null,
+    context: null,
+    pendingContext: null,
+    hydrate: hydrate,
+    remainingExpirationTime: NoWork,
+    firstBatch: null,
+    nextScheduledRoot: null
+  };
+  uninitializedFiber.stateNode = root;
+  return root;
+}
 
-var beginMark = function(markName) {
-  performance.mark(formatMarkName(markName));
-};
+var onCommitFiberRoot = null;
+var onCommitFiberUnmount = null;
+var hasLoggedError = false;
 
-var clearMark = function(markName) {
-  performance.clearMarks(formatMarkName(markName));
-};
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {
+      if (true && !hasLoggedError) {
+        hasLoggedError = true;
+        warning(false, "React DevTools encountered an error: %s", err);
+      }
+    }
+  };
+}
 
-var endMark = function(label, markName, warning$$1) {
-  var formattedMarkName = formatMarkName(markName);
-  var formattedLabel = formatLabel(label, warning$$1);
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
+  }
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
+  }
+  if (!hook.supportsFiber) {
+    {
+      warning(
+        false,
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://fb.me/react-devtools"
+      );
+    }
+    // DevTools exists, even though it doesn't support Fiber.
+    return true;
+  }
   try {
-    performance.measure(formattedLabel, formattedMarkName);
-  } catch (err) {}
-  // If previous mark was missing for some reason, this will throw.
-  // This could only happen if React crashed in an unexpected place earlier.
-  // Don't pile on with more errors.
-
-  // Clear marks immediately to avoid growing buffer.
-  performance.clearMarks(formattedMarkName);
-  performance.clearMeasures(formattedLabel);
-};
-
-var getFiberMarkName = function(label, debugID) {
-  return label + " (#" + debugID + ")";
-};
-
-var getFiberLabel = function(componentName, isMounted, phase) {
-  if (phase === null) {
-    // These are composite component total time measurements.
-    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
-  } else {
-    // Composite component methods.
-    return componentName + "." + phase;
+    var rendererID = hook.inject(internals);
+    // We have successfully injected, so now it is safe to set up hooks.
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      warning(false, "React DevTools encountered an error: %s.", err);
+    }
   }
-};
-
-var beginFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
+  // DevTools exists
+  return true;
+}
 
-  if (isCommitting && labelsInCurrentCommit.has(label)) {
-    // During the commit phase, we don't show duplicate labels because
-    // there is a fixed overhead for every measurement, and we don't
-    // want to stretch the commit phase beyond necessary.
-    return false;
+function onCommitRoot(root) {
+  if (typeof onCommitFiberRoot === "function") {
+    onCommitFiberRoot(root);
   }
-  labelsInCurrentCommit.add(label);
-
-  var markName = getFiberMarkName(label, debugID);
-  beginMark(markName);
-  return true;
-};
+}
 
-var clearFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  clearMark(markName);
-};
+function onCommitUnmount(fiber) {
+  if (typeof onCommitFiberUnmount === "function") {
+    onCommitFiberUnmount(fiber);
+  }
+}
 
-var endFiberMark = function(fiber, phase, warning$$1) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  endMark(label, markName, warning$$1);
+var describeComponentFrame = function(name, source, ownerName) {
+  return (
+    "\n    in " +
+    (name || "Unknown") +
+    (source
+      ? " (at " +
+        source.fileName.replace(/^.*[\\\/]/, "") +
+        ":" +
+        source.lineNumber +
+        ")"
+      : ownerName ? " (created by " + ownerName + ")" : "")
+  );
 };
 
-var shouldIgnoreFiber = function(fiber) {
-  // Host components should be skipped in the timeline.
-  // We could check typeof fiber.type, but does this work with RN?
+function describeFiber(fiber) {
   switch (fiber.tag) {
-    case HostRoot:
+    case IndeterminateComponent:
+    case FunctionalComponent:
+    case ClassComponent:
     case HostComponent:
-    case HostText:
-    case HostPortal:
-    case CallComponent:
-    case ReturnComponent:
-    case Fragment:
-      return true;
+      var owner = fiber._debugOwner;
+      var source = fiber._debugSource;
+      var name = getComponentName(fiber);
+      var ownerName = null;
+      if (owner) {
+        ownerName = getComponentName(owner);
+      }
+      return describeComponentFrame(name, source, ownerName);
     default:
-      return false;
+      return "";
   }
-};
+}
 
-var clearPendingPhaseMeasurement = function() {
-  if (currentPhase !== null && currentPhaseFiber !== null) {
-    clearFiberMark(currentPhaseFiber, currentPhase);
-  }
-  currentPhaseFiber = null;
-  currentPhase = null;
-  hasScheduledUpdateInCurrentPhase = false;
-};
-
-var pauseTimers = function() {
-  // Stops all currently active measurements so that they can be resumed
-  // if we continue in a later deferred loop from the same unit of work.
-  var fiber = currentFiber;
-  while (fiber) {
-    if (fiber._debugIsCurrentlyTiming) {
-      endFiberMark(fiber, null, null);
-    }
-    fiber = fiber["return"];
-  }
-};
-
-var resumeTimersRecursively = function(fiber) {
-  if (fiber["return"] !== null) {
-    resumeTimersRecursively(fiber["return"]);
-  }
-  if (fiber._debugIsCurrentlyTiming) {
-    beginFiberMark(fiber, null);
-  }
-};
+// This function can only be called with a work-in-progress fiber and
+// only during begin or complete phase. Do not call it under any other
+// circumstances.
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  var node = workInProgress;
+  do {
+    info += describeFiber(node);
+    // Otherwise this return pointer might point to the wrong tree:
+    node = node["return"];
+  } while (node);
+  return info;
+}
 
-var resumeTimers = function() {
-  // Resumes all measurements that were active during the last deferred loop.
-  if (currentFiber !== null) {
-    resumeTimersRecursively(currentFiber);
-  }
-};
+/**
+ * Forked from fbjs/warning:
+ * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+ *
+ * Only change is we use console.warn instead of console.error,
+ * and do nothing when 'console' is not supported.
+ * This really simplifies the code.
+ * ---
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
 
-function recordEffect() {
-  if (enableUserTimingAPI) {
-    effectCountInCurrentCommit++;
-  }
-}
+var lowPriorityWarning = function() {};
 
-function recordScheduleUpdate() {
-  if (enableUserTimingAPI) {
-    if (isCommitting) {
-      hasScheduledUpdateInCurrentCommit = true;
-    }
-    if (
-      currentPhase !== null &&
-      currentPhase !== "componentWillMount" &&
-      currentPhase !== "componentWillReceiveProps"
+{
+  var printWarning = function(format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 1 ? _len - 1 : 0),
+        _key = 1;
+      _key < _len;
+      _key++
     ) {
-      hasScheduledUpdateInCurrentPhase = true;
+      args[_key - 1] = arguments[_key];
     }
-  }
-}
 
-function startRequestCallbackTimer() {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming && !isWaitingForCallback) {
-      isWaitingForCallback = true;
-      beginMark("(Waiting for async callback...)");
+    var argIndex = 0;
+    var message =
+      "Warning: " +
+      format.replace(/%s/g, function() {
+        return args[argIndex++];
+      });
+    if (typeof console !== "undefined") {
+      console.warn(message);
     }
-  }
-}
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      throw new Error(message);
+    } catch (x) {}
+  };
 
-function stopRequestCallbackTimer(didExpire) {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming) {
-      isWaitingForCallback = false;
-      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
-      endMark(
-        "(Waiting for async callback...)",
-        "(Waiting for async callback...)",
-        warning$$1
+  lowPriorityWarning = function(condition, format) {
+    if (format === undefined) {
+      throw new Error(
+        "`warning(condition, format, ...args)` requires a warning " +
+          "message argument"
       );
     }
-  }
-}
-
-function startWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, this is the fiber to unwind from.
-    currentFiber = fiber;
-    if (!beginFiberMark(fiber, null)) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = true;
-  }
-}
+    if (!condition) {
+      for (
+        var _len2 = arguments.length,
+          args = Array(_len2 > 2 ? _len2 - 2 : 0),
+          _key2 = 2;
+        _key2 < _len2;
+        _key2++
+      ) {
+        args[_key2 - 2] = arguments[_key2];
+      }
 
-function cancelWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
+      printWarning.apply(undefined, [format].concat(args));
     }
-    // Remember we shouldn't complete measurement for this fiber.
-    // Otherwise flamechart will be deep even for small updates.
-    fiber._debugIsCurrentlyTiming = false;
-    clearFiberMark(fiber, null);
-  }
+  };
 }
 
-function stopWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    endFiberMark(fiber, null, null);
-  }
-}
+var lowPriorityWarning$1 = lowPriorityWarning;
 
-function stopFailedWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    var warning$$1 = "An error was thrown inside this error boundary";
-    endFiberMark(fiber, null, warning$$1);
-  }
-}
+var ReactStrictModeWarnings = {
+  discardPendingWarnings: function() {},
+  flushPendingDeprecationWarnings: function() {},
+  flushPendingUnsafeLifecycleWarnings: function() {},
+  recordDeprecationWarnings: function(fiber, instance) {},
+  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+};
 
-function startPhaseTimer(fiber, phase) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    clearPendingPhaseMeasurement();
-    if (!beginFiberMark(fiber, phase)) {
-      return;
-    }
-    currentPhaseFiber = fiber;
-    currentPhase = phase;
-  }
-}
+{
+  var LIFECYCLE_SUGGESTIONS = {
+    UNSAFE_componentWillMount: "componentDidMount",
+    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
+    UNSAFE_componentWillUpdate: "componentDidUpdate"
+  };
 
-function stopPhaseTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    if (currentPhase !== null && currentPhaseFiber !== null) {
-      var warning$$1 = hasScheduledUpdateInCurrentPhase
-        ? "Scheduled a cascading update"
-        : null;
-      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
-    }
-    currentPhase = null;
-    currentPhaseFiber = null;
-  }
-}
+  var pendingComponentWillMountWarnings = [];
+  var pendingComponentWillReceivePropsWarnings = [];
+  var pendingComponentWillUpdateWarnings = [];
+  var pendingUnsafeLifecycleWarnings = new Map();
 
-function startWorkLoopTimer(nextUnitOfWork) {
-  if (enableUserTimingAPI) {
-    currentFiber = nextUnitOfWork;
-    if (!supportsUserTiming) {
-      return;
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // This is top level call.
-    // Any other measurements are performed within.
-    beginMark("(React Tree Reconciliation)");
-    // Resume any measurements that were in progress during the last loop.
-    resumeTimers();
-  }
-}
+  // Tracks components we have already warned about.
+  var didWarnAboutDeprecatedLifecycles = new Set();
+  var didWarnAboutUnsafeLifecycles = new Set();
 
-function stopWorkLoopTimer(interruptedBy) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var warning$$1 = null;
-    if (interruptedBy !== null) {
-      if (interruptedBy.tag === HostRoot) {
-        warning$$1 = "A top-level update interrupted the previous render";
-      } else {
-        var componentName = getComponentName(interruptedBy) || "Unknown";
-        warning$$1 =
-          "An update to " + componentName + " interrupted the previous render";
-      }
-    } else if (commitCountInCurrentWorkLoop > 1) {
-      warning$$1 = "There were cascading updates";
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // Pause any measurements until the next loop.
-    pauseTimers();
-    endMark(
-      "(React Tree Reconciliation)",
-      "(React Tree Reconciliation)",
-      warning$$1
-    );
-  }
-}
-
-function startCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    isCommitting = true;
-    hasScheduledUpdateInCurrentCommit = false;
-    labelsInCurrentCommit.clear();
-    beginMark("(Committing Changes)");
-  }
-}
-
-function stopCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
+  ReactStrictModeWarnings.discardPendingWarnings = function() {
+    pendingComponentWillMountWarnings = [];
+    pendingComponentWillReceivePropsWarnings = [];
+    pendingComponentWillUpdateWarnings = [];
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-    var warning$$1 = null;
-    if (hasScheduledUpdateInCurrentCommit) {
-      warning$$1 = "Lifecycle hook scheduled a cascading update";
-    } else if (commitCountInCurrentWorkLoop > 0) {
-      warning$$1 = "Caused by a cascading update in earlier commit";
-    }
-    hasScheduledUpdateInCurrentCommit = false;
-    commitCountInCurrentWorkLoop++;
-    isCommitting = false;
-    labelsInCurrentCommit.clear();
+  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
+    pendingUnsafeLifecycleWarnings.forEach(function(
+      lifecycleWarningsMap,
+      strictRoot
+    ) {
+      var lifecyclesWarningMesages = [];
 
-    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
-  }
-}
+      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
+        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
+        if (lifecycleWarnings.length > 0) {
+          var componentNames = new Set();
+          lifecycleWarnings.forEach(function(fiber) {
+            componentNames.add(getComponentName(fiber) || "Component");
+            didWarnAboutUnsafeLifecycles.add(fiber.type);
+          });
 
-function startCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Committing Host Effects)");
-  }
-}
+          var formatted = lifecycle.replace("UNSAFE_", "");
+          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
+          var sortedComponentNames = Array.from(componentNames)
+            .sort()
+            .join(", ");
 
-function stopCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Committing Host Effects: " + count + " Total)",
-      "(Committing Host Effects)",
-      null
-    );
-  }
-}
+          lifecyclesWarningMesages.push(
+            formatted +
+              ": Please update the following components to use " +
+              (suggestion + " instead: " + sortedComponentNames)
+          );
+        }
+      });
 
-function startCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Calling Lifecycle Methods)");
-  }
-}
+      if (lifecyclesWarningMesages.length > 0) {
+        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+          strictRoot
+        );
 
-function stopCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Calling Lifecycle Methods: " + count + " Total)",
-      "(Calling Lifecycle Methods)",
-      null
-    );
-  }
-}
+        warning(
+          false,
+          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
+            "\n\n%s" +
+            "\n\nLearn more about this warning here:" +
+            "\nhttps://fb.me/react-strict-mode-warnings",
+          strictRootComponentStack,
+          lifecyclesWarningMesages.join("\n\n")
+        );
+      }
+    });
 
-var warnedAboutMissingGetChildContext = void 0;
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-{
-  warnedAboutMissingGetChildContext = {};
-}
+  var getStrictRoot = function(fiber) {
+    var maybeStrictRoot = null;
 
-// A cursor to the current merged context object on the stack.
-var contextStackCursor = createCursor(emptyObject);
-// A cursor to a boolean indicating whether the context has changed.
-var didPerformWorkStackCursor = createCursor(false);
-// Keep track of the previous context object that was on the stack.
-// We use this to get access to the parent context after we have already
-// pushed the next context provider, and now need to merge their contexts.
-var previousContext = emptyObject;
+    while (fiber !== null) {
+      if (fiber.mode & StrictMode) {
+        maybeStrictRoot = fiber;
+      }
 
-function getUnmaskedContext(workInProgress) {
-  var hasOwnContext = isContextProvider(workInProgress);
-  if (hasOwnContext) {
-    // If the fiber is a context provider itself, when we read its context
-    // we have already pushed its own child context on the stack. A context
-    // provider should not "see" its own child context. Therefore we read the
-    // previous (parent) context instead for a context provider.
-    return previousContext;
-  }
-  return contextStackCursor.current;
-}
+      fiber = fiber["return"];
+    }
 
-function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-  var instance = workInProgress.stateNode;
-  instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-  instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
-}
+    return maybeStrictRoot;
+  };
 
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var type = workInProgress.type;
-  var contextTypes = type.contextTypes;
-  if (!contextTypes) {
-    return emptyObject;
-  }
+  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
+    if (pendingComponentWillMountWarnings.length > 0) {
+      var uniqueNames = new Set();
+      pendingComponentWillMountWarnings.forEach(function(fiber) {
+        uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-  // Avoid recreating masked context unless unmasked context has changed.
-  // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-  // This may trigger infinite loops if componentWillReceiveProps calls setState.
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  ) {
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  }
+      var sortedNames = Array.from(uniqueNames)
+        .sort()
+        .join(", ");
 
-  var context = {};
-  for (var key in contextTypes) {
-    context[key] = unmaskedContext[key];
-  }
+      lowPriorityWarning$1(
+        false,
+        "componentWillMount is deprecated and will be removed in the next major version. " +
+          "Use componentDidMount instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillMount." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        sortedNames
+      );
 
-  {
-    var name = getComponentName(workInProgress) || "Unknown";
-    checkPropTypes(
-      contextTypes,
-      context,
-      "context",
-      name,
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
-  }
+      pendingComponentWillMountWarnings = [];
+    }
 
-  // Cache unmasked context so we can avoid recreating masked context unless necessary.
-  // Context is created before the class component is instantiated so check for instance.
-  if (instance) {
-    cacheContext(workInProgress, unmaskedContext, context);
-  }
+    if (pendingComponentWillReceivePropsWarnings.length > 0) {
+      var _uniqueNames = new Set();
+      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
+        _uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-  return context;
-}
+      var _sortedNames = Array.from(_uniqueNames)
+        .sort()
+        .join(", ");
 
-function hasContextChanged() {
-  return didPerformWorkStackCursor.current;
-}
+      lowPriorityWarning$1(
+        false,
+        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
+          "Use static getDerivedStateFromProps instead." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames
+      );
 
-function isContextConsumer(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
-}
+      pendingComponentWillReceivePropsWarnings = [];
+    }
 
-function isContextProvider(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
-}
+    if (pendingComponentWillUpdateWarnings.length > 0) {
+      var _uniqueNames2 = new Set();
+      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
+        _uniqueNames2.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-function popContextProvider(fiber) {
-  if (!isContextProvider(fiber)) {
-    return;
-  }
+      var _sortedNames2 = Array.from(_uniqueNames2)
+        .sort()
+        .join(", ");
 
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
-}
+      lowPriorityWarning$1(
+        false,
+        "componentWillUpdate is deprecated and will be removed in the next major version. " +
+          "Use componentDidUpdate instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillUpdate." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames2
+      );
 
-function popTopLevelContextObject(fiber) {
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
-}
+      pendingComponentWillUpdateWarnings = [];
+    }
+  };
 
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    contextStackCursor.cursor == null,
-    "Unexpected context found on stack. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
+  ReactStrictModeWarnings.recordDeprecationWarnings = function(
+    fiber,
+    instance
+  ) {
+    // Dedup strategy: Warn once per component.
+    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+      return;
+    }
 
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
-}
-
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode;
-  var childContextTypes = fiber.type.childContextTypes;
-
-  // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-  // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-  if (typeof instance.getChildContext !== "function") {
-    {
-      var componentName = getComponentName(fiber) || "Unknown";
-
-      if (!warnedAboutMissingGetChildContext[componentName]) {
-        warnedAboutMissingGetChildContext[componentName] = true;
-        warning(
-          false,
-          "%s.childContextTypes is specified but there is no getChildContext() method " +
-            "on the instance. You can either define getChildContext() on %s or remove " +
-            "childContextTypes from it.",
-          componentName,
-          componentName
-        );
-      }
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillMountWarnings.push(fiber);
     }
-    return parentContext;
-  }
-
-  var childContext = void 0;
-  {
-    ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
-  }
-  startPhaseTimer(fiber, "getChildContext");
-  childContext = instance.getChildContext();
-  stopPhaseTimer();
-  {
-    ReactDebugCurrentFiber.setCurrentPhase(null);
-  }
-  for (var contextKey in childContext) {
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
-  }
-  {
-    var name = getComponentName(fiber) || "Unknown";
-    checkPropTypes(
-      childContextTypes,
-      childContext,
-      "child context",
-      name,
-      // In practice, there is one case in which we won't get a stack. It's when
-      // somebody calls unstable_renderSubtreeIntoContainer() and we process
-      // context from the parent component instance. The stack will be missing
-      // because it's outside of the reconciliation, and so the pointer has not
-      // been set. This is rare and doesn't matter. We'll also remove that API.
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
-  }
-
-  return Object.assign({}, parentContext, childContext);
-}
-
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) {
-    return false;
-  }
-
-  var instance = workInProgress.stateNode;
-  // We push the context as early as possible to ensure stack integrity.
-  // If the instance does not exist yet, we will push null at first,
-  // and replace it on the stack later when invalidating the context.
-  var memoizedMergedChildContext =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-
-  // Remember the parent context so we can merge with it later.
-  // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
-
-  return true;
-}
-
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
-
-  if (didChange) {
-    // Merge parent and own context.
-    // Skip this if we're not updating due to sCU.
-    // This avoids unnecessarily recomputing memoized values.
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-
-    // Replace the old (or empty) context with the new one.
-    // It is important to unwind the context in the reverse order.
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    // Now push the new context and mark that it has changed.
-    push(contextStackCursor, mergedContext, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
-  } else {
-    pop(didPerformWorkStackCursor, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
-  }
-}
-
-function resetContext() {
-  previousContext = emptyObject;
-  contextStackCursor.current = emptyObject;
-  didPerformWorkStackCursor.current = false;
-}
-
-function findCurrentUnmaskedContext(fiber) {
-  // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-  // makes sense elsewhere
-  invariant(
-    isFiberMounted(fiber) && fiber.tag === ClassComponent,
-    "Expected subtree parent to be a mounted class component. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
-
-  var node = fiber;
-  while (node.tag !== HostRoot) {
-    if (isContextProvider(node)) {
-      return node.stateNode.__reactInternalMemoizedMergedChildContext;
+    if (
+      typeof instance.componentWillReceiveProps === "function" &&
+      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillReceivePropsWarnings.push(fiber);
     }
-    var parent = node["return"];
-    invariant(
-      parent,
-      "Found unexpected detached subtree parent. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-    node = parent;
-  }
-  return node.stateNode.context;
-}
-
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
-
-// TODO: Use an opaque type once ESLint et al support the syntax
-
-var NoWork = 0;
-var Sync = 1;
-var Never = MAX_SIGNED_31_BIT_INT;
-
-var UNIT_SIZE = 10;
-var MAGIC_NUMBER_OFFSET = 2;
-
-// 1 unit of expiration time represents 10ms.
-function msToExpirationTime(ms) {
-  // Always add an offset so that we don't clash with the magic number for NoWork.
-  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
-}
-
-function expirationTimeToMs(expirationTime) {
-  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
-}
-
-function ceiling(num, precision) {
-  return (((num / precision) | 0) + 1) * precision;
-}
-
-function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
-  return ceiling(
-    currentTime + expirationInMs / UNIT_SIZE,
-    bucketSizeMs / UNIT_SIZE
-  );
-}
-
-var NoContext = 0;
-var AsyncMode = 1;
-var StrictMode = 2;
-
-var hasBadMapPolyfill = void 0;
-
-{
-  hasBadMapPolyfill = false;
-  try {
-    var nonExtensibleObject = Object.preventExtensions({});
-    var testMap = new Map([[nonExtensibleObject, null]]);
-    var testSet = new Set([nonExtensibleObject]);
-    // This is necessary for Rollup to not consider these unused.
-    // https://github.com/rollup/rollup/issues/1771
-    // TODO: we can remove these if Rollup fixes the bug.
-    testMap.set(0, 0);
-    testSet.add(0);
-  } catch (e) {
-    // TODO: Consider warning about bad polyfills
-    hasBadMapPolyfill = true;
-  }
-}
-
-// A Fiber is work on a Component that needs to be done or was done. There can
-// be more than one per component.
-
-var debugCounter = void 0;
-
-{
-  debugCounter = 1;
-}
-
-function FiberNode(tag, pendingProps, key, mode) {
-  // Instance
-  this.tag = tag;
-  this.key = key;
-  this.type = null;
-  this.stateNode = null;
-
-  // Fiber
-  this["return"] = null;
-  this.child = null;
-  this.sibling = null;
-  this.index = 0;
-
-  this.ref = null;
-
-  this.pendingProps = pendingProps;
-  this.memoizedProps = null;
-  this.updateQueue = null;
-  this.memoizedState = null;
-
-  this.mode = mode;
-
-  // Effects
-  this.effectTag = NoEffect;
-  this.nextEffect = null;
-
-  this.firstEffect = null;
-  this.lastEffect = null;
-
-  this.expirationTime = NoWork;
-
-  this.alternate = null;
-
-  {
-    this._debugID = debugCounter++;
-    this._debugSource = null;
-    this._debugOwner = null;
-    this._debugIsCurrentlyTiming = false;
-    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
-      Object.preventExtensions(this);
+    if (
+      typeof instance.componentWillUpdate === "function" &&
+      instance.componentWillUpdate.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillUpdateWarnings.push(fiber);
     }
-  }
-}
-
-// This is a constructor function, rather than a POJO constructor, still
-// please ensure we do the following:
-// 1) Nobody should add any instance methods on this. Instance methods can be
-//    more difficult to predict when they get optimized and they are almost
-//    never inlined properly in static compilers.
-// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
-//    always know when it is a fiber.
-// 3) We might want to experiment with using numeric keys since they are easier
-//    to optimize in a non-JIT environment.
-// 4) We can easily go from a constructor to a createFiber object literal if that
-//    is faster.
-// 5) It should be easy to port this to a C struct and keep a C implementation
-//    compatible.
-var createFiber = function(tag, pendingProps, key, mode) {
-  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
-  return new FiberNode(tag, pendingProps, key, mode);
-};
-
-function shouldConstruct(Component) {
-  return !!(Component.prototype && Component.prototype.isReactComponent);
-}
+  };
 
-// This is used to create an alternate fiber to do work on.
-function createWorkInProgress(current, pendingProps, expirationTime) {
-  var workInProgress = current.alternate;
-  if (workInProgress === null) {
-    // We use a double buffering pooling technique because we know that we'll
-    // only ever need at most two versions of a tree. We pool the "other" unused
-    // node that we're free to reuse. This is lazily created to avoid allocating
-    // extra objects for things that are never updated. It also allow us to
-    // reclaim the extra memory if needed.
-    workInProgress = createFiber(
-      current.tag,
-      pendingProps,
-      current.key,
-      current.mode
-    );
-    workInProgress.type = current.type;
-    workInProgress.stateNode = current.stateNode;
+  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
+    fiber,
+    instance
+  ) {
+    var strictRoot = getStrictRoot(fiber);
 
-    {
-      // DEV-only fields
-      workInProgress._debugID = current._debugID;
-      workInProgress._debugSource = current._debugSource;
-      workInProgress._debugOwner = current._debugOwner;
+    // Dedup strategy: Warn once per component.
+    // This is difficult to track any other way since component names
+    // are often vague and are likely to collide between 3rd party libraries.
+    // An expand property is probably okay to use here since it's DEV-only,
+    // and will only be set in the event of serious warnings.
+    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+      return;
     }
 
-    workInProgress.alternate = current;
-    current.alternate = workInProgress;
-  } else {
-    workInProgress.pendingProps = pendingProps;
-
-    // We already have an alternate.
-    // Reset the effect tag.
-    workInProgress.effectTag = NoEffect;
-
-    // The effect list is no longer valid.
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
-  }
-
-  workInProgress.expirationTime = expirationTime;
-
-  workInProgress.child = current.child;
-  workInProgress.memoizedProps = current.memoizedProps;
-  workInProgress.memoizedState = current.memoizedState;
-  workInProgress.updateQueue = current.updateQueue;
-
-  // These will be overridden during the parent's reconciliation
-  workInProgress.sibling = current.sibling;
-  workInProgress.index = current.index;
-  workInProgress.ref = current.ref;
-
-  return workInProgress;
-}
-
-function createHostRootFiber(isAsync) {
-  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
-  return createFiber(HostRoot, null, null, mode);
-}
-
-function createFiberFromElement(element, mode, expirationTime) {
-  var owner = null;
-  {
-    owner = element._owner;
-  }
-
-  var fiber = void 0;
-  var type = element.type;
-  var key = element.key;
-  var pendingProps = element.props;
-
-  var fiberTag = void 0;
-  if (typeof type === "function") {
-    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
-  } else if (typeof type === "string") {
-    fiberTag = HostComponent;
-  } else {
-    switch (type) {
-      case REACT_FRAGMENT_TYPE:
-        return createFiberFromFragment(
-          pendingProps.children,
-          mode,
-          expirationTime,
-          key
-        );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= AsyncMode | StrictMode;
-        break;
-      case REACT_STRICT_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= StrictMode;
-        break;
-      case REACT_CALL_TYPE:
-        fiberTag = CallComponent;
-        break;
-      case REACT_RETURN_TYPE:
-        fiberTag = ReturnComponent;
-        break;
-      default: {
-        if (typeof type === "object" && type !== null) {
-          switch (type.$$typeof) {
-            case REACT_PROVIDER_TYPE:
-              fiberTag = ContextProvider;
-              break;
-            case REACT_CONTEXT_TYPE:
-              // This is a consumer
-              fiberTag = ContextConsumer;
-              break;
-            default:
-              if (typeof type.tag === "number") {
-                // Currently assumed to be a continuation and therefore is a
-                // fiber already.
-                // TODO: The yield system is currently broken for updates in
-                // some cases. The reified yield stores a fiber, but we don't
-                // know which fiber that is; the current or a workInProgress?
-                // When the continuation gets rendered here we don't know if we
-                // can reuse that fiber or if we need to clone it. There is
-                // probably a clever way to restructure this.
-                fiber = type;
-                fiber.pendingProps = pendingProps;
-                fiber.expirationTime = expirationTime;
-                return fiber;
-              } else {
-                throwOnInvalidElementType(type, owner);
-              }
-              break;
-          }
-        } else {
-          throwOnInvalidElementType(type, owner);
-        }
-      }
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    // Note that it is sufficient to check for the presence of a
+    // single lifecycle, componentWillMount, with the polyfill flag.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning === true
+    ) {
+      return;
     }
-  }
 
-  fiber = createFiber(fiberTag, pendingProps, key, mode);
-  fiber.type = type;
-  fiber.expirationTime = expirationTime;
-
-  {
-    fiber._debugSource = element._source;
-    fiber._debugOwner = element._owner;
-  }
+    var warningsForRoot = void 0;
+    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
+      warningsForRoot = {
+        UNSAFE_componentWillMount: [],
+        UNSAFE_componentWillReceiveProps: [],
+        UNSAFE_componentWillUpdate: []
+      };
 
-  return fiber;
-}
+      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
+    } else {
+      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
+    }
 
-function throwOnInvalidElementType(type, owner) {
-  var info = "";
-  {
+    var unsafeLifecycles = [];
     if (
-      type === undefined ||
-      (typeof type === "object" &&
-        type !== null &&
-        Object.keys(type).length === 0)
+      typeof instance.componentWillMount === "function" ||
+      typeof instance.UNSAFE_componentWillMount === "function"
     ) {
-      info +=
-        " You likely forgot to export your component from the file " +
-        "it's defined in, or you might have mixed up default and " +
-        "named imports.";
+      unsafeLifecycles.push("UNSAFE_componentWillMount");
     }
-    var ownerName = owner ? getComponentName(owner) : null;
-    if (ownerName) {
-      info += "\n\nCheck the render method of `" + ownerName + "`.";
+    if (
+      typeof instance.componentWillReceiveProps === "function" ||
+      typeof instance.UNSAFE_componentWillReceiveProps === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" ||
+      typeof instance.UNSAFE_componentWillUpdate === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
     }
-  }
-  invariant(
-    false,
-    "Element type is invalid: expected a string (for built-in " +
-      "components) or a class/function (for composite components) " +
-      "but got: %s.%s",
-    type == null ? type : typeof type,
-    info
-  );
-}
-
-function createFiberFromFragment(elements, mode, expirationTime, key) {
-  var fiber = createFiber(Fragment, elements, key, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
-}
-
-function createFiberFromText(content, mode, expirationTime) {
-  var fiber = createFiber(HostText, content, null, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
-}
-
-function createFiberFromHostInstanceForDeletion() {
-  var fiber = createFiber(HostComponent, null, null, NoContext);
-  fiber.type = "DELETED";
-  return fiber;
-}
-
-function createFiberFromPortal(portal, mode, expirationTime) {
-  var pendingProps = portal.children !== null ? portal.children : [];
-  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
-  fiber.expirationTime = expirationTime;
-  fiber.stateNode = {
-    containerInfo: portal.containerInfo,
-    pendingChildren: null, // Used by persistent updates
-    implementation: portal.implementation
-  };
-  return fiber;
-}
-
-// TODO: This should be lifted into the renderer.
-
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  // Cyclic construction. This cheats the type system right now because
-  // stateNode is any.
-  var uninitializedFiber = createHostRootFiber(isAsync);
-  var root = {
-    current: uninitializedFiber,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    remainingExpirationTime: NoWork,
-    isReadyForCommit: false,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
-  uninitializedFiber.stateNode = root;
-  return root;
-}
-
-var onCommitFiberRoot = null;
-var onCommitFiberUnmount = null;
-var hasLoggedError = false;
 
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (true && !hasLoggedError) {
-        hasLoggedError = true;
-        warning(false, "React DevTools encountered an error: %s", err);
-      }
+    if (unsafeLifecycles.length > 0) {
+      unsafeLifecycles.forEach(function(lifecycle) {
+        warningsForRoot[lifecycle].push(fiber);
+      });
     }
   };
 }
 
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-  if (!hook.supportsFiber) {
-    {
-      warning(
-        false,
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://fb.me/react-devtools"
-      );
+// Re-export dynamic flags from the fbsource version.
+var _require = require("ReactFeatureFlags");
+
+var enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch;
+var debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects;
+var debugRenderPhaseSideEffectsForStrictMode =
+  _require.debugRenderPhaseSideEffectsForStrictMode;
+var warnAboutDeprecatedLifecycles = _require.warnAboutDeprecatedLifecycles;
+var replayFailedUnitOfWorkWithInvokeGuardedCallback =
+  _require.replayFailedUnitOfWorkWithInvokeGuardedCallback;
+
+var enableUserTimingAPI = true;
+var enableMutatingReconciler = true;
+var enableNoopReconciler = false;
+var enablePersistentReconciler = false;
+
+// Only used in www builds.
+
+function getCurrentFiberOwnerName() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
     }
-    // DevTools exists, even though it doesn't support Fiber.
-    return true;
-  }
-  try {
-    var rendererID = hook.inject(internals);
-    // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      warning(false, "React DevTools encountered an error: %s.", err);
+    var owner = fiber._debugOwner;
+    if (owner !== null && typeof owner !== "undefined") {
+      return getComponentName(owner);
     }
   }
-  // DevTools exists
-  return true;
+  return null;
 }
 
-function onCommitRoot(root) {
-  if (typeof onCommitFiberRoot === "function") {
-    onCommitFiberRoot(root);
+function getCurrentFiberStackAddendum() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
+    }
+    // Safe because if current fiber exists, we are reconciling,
+    // and it is guaranteed to be the work-in-progress version.
+    return getStackAddendumByWorkInProgressFiber(fiber);
   }
+  return null;
 }
 
-function onCommitUnmount(fiber) {
-  if (typeof onCommitFiberUnmount === "function") {
-    onCommitFiberUnmount(fiber);
-  }
+function resetCurrentFiber() {
+  ReactDebugCurrentFrame.getCurrentStack = null;
+  ReactDebugCurrentFiber.current = null;
+  ReactDebugCurrentFiber.phase = null;
 }
 
-/**
- * Forked from fbjs/warning:
- * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
- *
- * Only change is we use console.warn instead of console.error,
- * and do nothing when 'console' is not supported.
- * This really simplifies the code.
- * ---
- * Similar to invariant but only logs a warning if the condition is not met.
- * This can be used to log issues in development environments in critical
- * paths. Removing the logging code for production environments will keep the
- * same logic and follow the same code paths.
- */
-
-var lowPriorityWarning = function() {};
+function setCurrentFiber(fiber) {
+  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
+  ReactDebugCurrentFiber.current = fiber;
+  ReactDebugCurrentFiber.phase = null;
+}
 
-{
-  var printWarning = function(format) {
-    for (
-      var _len = arguments.length,
-        args = Array(_len > 1 ? _len - 1 : 0),
-        _key = 1;
-      _key < _len;
-      _key++
-    ) {
-      args[_key - 1] = arguments[_key];
-    }
+function setCurrentPhase(phase) {
+  ReactDebugCurrentFiber.phase = phase;
+}
 
-    var argIndex = 0;
-    var message =
-      "Warning: " +
-      format.replace(/%s/g, function() {
-        return args[argIndex++];
-      });
-    if (typeof console !== "undefined") {
-      console.warn(message);
-    }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) {}
-  };
+var ReactDebugCurrentFiber = {
+  current: null,
+  phase: null,
+  resetCurrentFiber: resetCurrentFiber,
+  setCurrentFiber: setCurrentFiber,
+  setCurrentPhase: setCurrentPhase,
+  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
+  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
+};
 
-  lowPriorityWarning = function(condition, format) {
-    if (format === undefined) {
-      throw new Error(
-        "`warning(condition, format, ...args)` requires a warning " +
-          "message argument"
-      );
-    }
-    if (!condition) {
-      for (
-        var _len2 = arguments.length,
-          args = Array(_len2 > 2 ? _len2 - 2 : 0),
-          _key2 = 2;
-        _key2 < _len2;
-        _key2++
-      ) {
-        args[_key2 - 2] = arguments[_key2];
-      }
+// Prefix measurements so that it's possible to filter them.
+// Longer prefixes are hard to read in DevTools.
+var reactEmoji = "\u269B";
+var warningEmoji = "\u26D4";
+var supportsUserTiming =
+  typeof performance !== "undefined" &&
+  typeof performance.mark === "function" &&
+  typeof performance.clearMarks === "function" &&
+  typeof performance.measure === "function" &&
+  typeof performance.clearMeasures === "function";
 
-      printWarning.apply(undefined, [format].concat(args));
-    }
-  };
-}
+// Keep track of current fiber so that we know the path to unwind on pause.
+// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
+var currentFiber = null;
+// If we're in the middle of user code, which fiber and method is it?
+// Reusing `currentFiber` would be confusing for this because user code fiber
+// can change during commit phase too, but we don't need to unwind it (since
+// lifecycles in the commit phase don't resemble a tree).
+var currentPhase = null;
+var currentPhaseFiber = null;
+// Did lifecycle hook schedule an update? This is often a performance problem,
+// so we will keep track of it, and include it in the report.
+// Track commits caused by cascading updates.
+var isCommitting = false;
+var hasScheduledUpdateInCurrentCommit = false;
+var hasScheduledUpdateInCurrentPhase = false;
+var commitCountInCurrentWorkLoop = 0;
+var effectCountInCurrentCommit = 0;
+var isWaitingForCallback = false;
+// During commits, we only show a measurement once per method name
+// to avoid stretch the commit phase with measurement overhead.
+var labelsInCurrentCommit = new Set();
 
-var lowPriorityWarning$1 = lowPriorityWarning;
+var formatMarkName = function(markName) {
+  return reactEmoji + " " + markName;
+};
 
-var ReactStrictModeWarnings = {
-  discardPendingWarnings: function() {},
-  flushPendingDeprecationWarnings: function() {},
-  flushPendingUnsafeLifecycleWarnings: function() {},
-  recordDeprecationWarnings: function(fiber, instance) {},
-  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+var formatLabel = function(label, warning$$1) {
+  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
+  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
+  return "" + prefix + label + suffix;
 };
 
-{
-  var LIFECYCLE_SUGGESTIONS = {
-    UNSAFE_componentWillMount: "componentDidMount",
-    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
-    UNSAFE_componentWillUpdate: "componentDidUpdate"
-  };
+var beginMark = function(markName) {
+  performance.mark(formatMarkName(markName));
+};
 
-  var pendingComponentWillMountWarnings = [];
-  var pendingComponentWillReceivePropsWarnings = [];
-  var pendingComponentWillUpdateWarnings = [];
-  var pendingUnsafeLifecycleWarnings = new Map();
+var clearMark = function(markName) {
+  performance.clearMarks(formatMarkName(markName));
+};
 
-  // Tracks components we have already warned about.
-  var didWarnAboutDeprecatedLifecycles = new Set();
-  var didWarnAboutUnsafeLifecycles = new Set();
+var endMark = function(label, markName, warning$$1) {
+  var formattedMarkName = formatMarkName(markName);
+  var formattedLabel = formatLabel(label, warning$$1);
+  try {
+    performance.measure(formattedLabel, formattedMarkName);
+  } catch (err) {}
+  // If previous mark was missing for some reason, this will throw.
+  // This could only happen if React crashed in an unexpected place earlier.
+  // Don't pile on with more errors.
 
-  ReactStrictModeWarnings.discardPendingWarnings = function() {
-    pendingComponentWillMountWarnings = [];
-    pendingComponentWillReceivePropsWarnings = [];
-    pendingComponentWillUpdateWarnings = [];
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+  // Clear marks immediately to avoid growing buffer.
+  performance.clearMarks(formattedMarkName);
+  performance.clearMeasures(formattedLabel);
+};
 
-  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
-    pendingUnsafeLifecycleWarnings.forEach(function(
-      lifecycleWarningsMap,
-      strictRoot
-    ) {
-      var lifecyclesWarningMesages = [];
+var getFiberMarkName = function(label, debugID) {
+  return label + " (#" + debugID + ")";
+};
 
-      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
-        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
-        if (lifecycleWarnings.length > 0) {
-          var componentNames = new Set();
-          lifecycleWarnings.forEach(function(fiber) {
-            componentNames.add(getComponentName(fiber) || "Component");
-            didWarnAboutUnsafeLifecycles.add(fiber.type);
-          });
+var getFiberLabel = function(componentName, isMounted, phase) {
+  if (phase === null) {
+    // These are composite component total time measurements.
+    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
+  } else {
+    // Composite component methods.
+    return componentName + "." + phase;
+  }
+};
 
-          var formatted = lifecycle.replace("UNSAFE_", "");
-          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
-          var sortedComponentNames = Array.from(componentNames)
-            .sort()
-            .join(", ");
+var beginFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
 
-          lifecyclesWarningMesages.push(
-            formatted +
-              ": Please update the following components to use " +
-              (suggestion + " instead: " + sortedComponentNames)
-          );
-        }
-      });
+  if (isCommitting && labelsInCurrentCommit.has(label)) {
+    // During the commit phase, we don't show duplicate labels because
+    // there is a fixed overhead for every measurement, and we don't
+    // want to stretch the commit phase beyond necessary.
+    return false;
+  }
+  labelsInCurrentCommit.add(label);
 
-      if (lifecyclesWarningMesages.length > 0) {
-        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-          strictRoot
-        );
+  var markName = getFiberMarkName(label, debugID);
+  beginMark(markName);
+  return true;
+};
 
-        warning(
-          false,
-          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
-            "\n\n%s" +
-            "\n\nLearn more about this warning here:" +
-            "\nhttps://fb.me/react-strict-mode-warnings",
-          strictRootComponentStack,
-          lifecyclesWarningMesages.join("\n\n")
-        );
-      }
-    });
+var clearFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  clearMark(markName);
+};
 
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+var endFiberMark = function(fiber, phase, warning$$1) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  endMark(label, markName, warning$$1);
+};
 
-  var getStrictRoot = function(fiber) {
-    var maybeStrictRoot = null;
+var shouldIgnoreFiber = function(fiber) {
+  // Host components should be skipped in the timeline.
+  // We could check typeof fiber.type, but does this work with RN?
+  switch (fiber.tag) {
+    case HostRoot:
+    case HostComponent:
+    case HostText:
+    case HostPortal:
+    case CallComponent:
+    case ReturnComponent:
+    case Fragment:
+    case ContextProvider:
+    case ContextConsumer:
+      return true;
+    default:
+      return false;
+  }
+};
 
-    while (fiber !== null) {
-      if (fiber.mode & StrictMode) {
-        maybeStrictRoot = fiber;
-      }
+var clearPendingPhaseMeasurement = function() {
+  if (currentPhase !== null && currentPhaseFiber !== null) {
+    clearFiberMark(currentPhaseFiber, currentPhase);
+  }
+  currentPhaseFiber = null;
+  currentPhase = null;
+  hasScheduledUpdateInCurrentPhase = false;
+};
 
-      fiber = fiber["return"];
+var pauseTimers = function() {
+  // Stops all currently active measurements so that they can be resumed
+  // if we continue in a later deferred loop from the same unit of work.
+  var fiber = currentFiber;
+  while (fiber) {
+    if (fiber._debugIsCurrentlyTiming) {
+      endFiberMark(fiber, null, null);
     }
+    fiber = fiber["return"];
+  }
+};
 
-    return maybeStrictRoot;
-  };
+var resumeTimersRecursively = function(fiber) {
+  if (fiber["return"] !== null) {
+    resumeTimersRecursively(fiber["return"]);
+  }
+  if (fiber._debugIsCurrentlyTiming) {
+    beginFiberMark(fiber, null);
+  }
+};
 
-  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
-    if (pendingComponentWillMountWarnings.length > 0) {
-      var uniqueNames = new Set();
-      pendingComponentWillMountWarnings.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
+var resumeTimers = function() {
+  // Resumes all measurements that were active during the last deferred loop.
+  if (currentFiber !== null) {
+    resumeTimersRecursively(currentFiber);
+  }
+};
 
-      var sortedNames = Array.from(uniqueNames)
-        .sort()
-        .join(", ");
+function recordEffect() {
+  if (enableUserTimingAPI) {
+    effectCountInCurrentCommit++;
+  }
+}
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillMount is deprecated and will be removed in the next major version. " +
-          "Use componentDidMount instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillMount." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        sortedNames
-      );
+function recordScheduleUpdate() {
+  if (enableUserTimingAPI) {
+    if (isCommitting) {
+      hasScheduledUpdateInCurrentCommit = true;
+    }
+    if (
+      currentPhase !== null &&
+      currentPhase !== "componentWillMount" &&
+      currentPhase !== "componentWillReceiveProps"
+    ) {
+      hasScheduledUpdateInCurrentPhase = true;
+    }
+  }
+}
 
-      pendingComponentWillMountWarnings = [];
+function startRequestCallbackTimer() {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming && !isWaitingForCallback) {
+      isWaitingForCallback = true;
+      beginMark("(Waiting for async callback...)");
     }
+  }
+}
 
-    if (pendingComponentWillReceivePropsWarnings.length > 0) {
-      var _uniqueNames = new Set();
-      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
-        _uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
+function stopRequestCallbackTimer(didExpire, expirationTime) {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming) {
+      isWaitingForCallback = false;
+      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
+      endMark(
+        "(Waiting for async callback... will force flush in " +
+          expirationTime +
+          " ms)",
+        "(Waiting for async callback...)",
+        warning$$1
+      );
+    }
+  }
+}
 
-      var _sortedNames = Array.from(_uniqueNames)
-        .sort()
-        .join(", ");
+function startWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, this is the fiber to unwind from.
+    currentFiber = fiber;
+    if (!beginFiberMark(fiber, null)) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = true;
+  }
+}
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
-          "Use static getDerivedStateFromProps instead." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames
-      );
+function cancelWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // Remember we shouldn't complete measurement for this fiber.
+    // Otherwise flamechart will be deep even for small updates.
+    fiber._debugIsCurrentlyTiming = false;
+    clearFiberMark(fiber, null);
+  }
+}
 
-      pendingComponentWillReceivePropsWarnings = [];
+function stopWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
     }
+    fiber._debugIsCurrentlyTiming = false;
+    endFiberMark(fiber, null, null);
+  }
+}
 
-    if (pendingComponentWillUpdateWarnings.length > 0) {
-      var _uniqueNames2 = new Set();
-      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
-        _uniqueNames2.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames2 = Array.from(_uniqueNames2)
-        .sort()
-        .join(", ");
+function stopFailedWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = false;
+    var warning$$1 = "An error was thrown inside this error boundary";
+    endFiberMark(fiber, null, warning$$1);
+  }
+}
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillUpdate is deprecated and will be removed in the next major version. " +
-          "Use componentDidUpdate instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillUpdate." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames2
-      );
+function startPhaseTimer(fiber, phase) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    clearPendingPhaseMeasurement();
+    if (!beginFiberMark(fiber, phase)) {
+      return;
+    }
+    currentPhaseFiber = fiber;
+    currentPhase = phase;
+  }
+}
 
-      pendingComponentWillUpdateWarnings = [];
+function stopPhaseTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
+    if (currentPhase !== null && currentPhaseFiber !== null) {
+      var warning$$1 = hasScheduledUpdateInCurrentPhase
+        ? "Scheduled a cascading update"
+        : null;
+      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
+    }
+    currentPhase = null;
+    currentPhaseFiber = null;
+  }
+}
 
-  ReactStrictModeWarnings.recordDeprecationWarnings = function(
-    fiber,
-    instance
-  ) {
-    // Dedup strategy: Warn once per component.
-    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+function startWorkLoopTimer(nextUnitOfWork) {
+  if (enableUserTimingAPI) {
+    currentFiber = nextUnitOfWork;
+    if (!supportsUserTiming) {
       return;
     }
+    commitCountInCurrentWorkLoop = 0;
+    // This is top level call.
+    // Any other measurements are performed within.
+    beginMark("(React Tree Reconciliation)");
+    // Resume any measurements that were in progress during the last loop.
+    resumeTimers();
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
+function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    var warning$$1 = null;
+    if (interruptedBy !== null) {
+      if (interruptedBy.tag === HostRoot) {
+        warning$$1 = "A top-level update interrupted the previous render";
+      } else {
+        var componentName = getComponentName(interruptedBy) || "Unknown";
+        warning$$1 =
+          "An update to " + componentName + " interrupted the previous render";
+      }
+    } else if (commitCountInCurrentWorkLoop > 1) {
+      warning$$1 = "There were cascading updates";
+    }
+    commitCountInCurrentWorkLoop = 0;
+    var label = didCompleteRoot
+      ? "(React Tree Reconciliation: Completed Root)"
+      : "(React Tree Reconciliation: Yielded)";
+    // Pause any measurements until the next loop.
+    pauseTimers();
+    endMark(label, "(React Tree Reconciliation)", warning$$1);
+  }
+}
 
-    if (typeof instance.componentWillMount === "function") {
-      pendingComponentWillMountWarnings.push(fiber);
+function startCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (typeof instance.componentWillReceiveProps === "function") {
-      pendingComponentWillReceivePropsWarnings.push(fiber);
+    isCommitting = true;
+    hasScheduledUpdateInCurrentCommit = false;
+    labelsInCurrentCommit.clear();
+    beginMark("(Committing Changes)");
+  }
+}
+
+function stopCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (typeof instance.componentWillUpdate === "function") {
-      pendingComponentWillUpdateWarnings.push(fiber);
+
+    var warning$$1 = null;
+    if (hasScheduledUpdateInCurrentCommit) {
+      warning$$1 = "Lifecycle hook scheduled a cascading update";
+    } else if (commitCountInCurrentWorkLoop > 0) {
+      warning$$1 = "Caused by a cascading update in earlier commit";
     }
-  };
+    hasScheduledUpdateInCurrentCommit = false;
+    commitCountInCurrentWorkLoop++;
+    isCommitting = false;
+    labelsInCurrentCommit.clear();
 
-  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
-    fiber,
-    instance
-  ) {
-    var strictRoot = getStrictRoot(fiber);
+    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
+  }
+}
 
-    // Dedup strategy: Warn once per component.
-    // This is difficult to track any other way since component names
-    // are often vague and are likely to collide between 3rd party libraries.
-    // An expand property is probably okay to use here since it's DEV-only,
-    // and will only be set in the event of serious warnings.
-    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+function startCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Snapshot Effects)");
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
+function stopCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Snapshot Effects: " + count + " Total)",
+      "(Committing Snapshot Effects)",
+      null
+    );
+  }
+}
 
-    var warningsForRoot = void 0;
-    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
-      warningsForRoot = {
-        UNSAFE_componentWillMount: [],
-        UNSAFE_componentWillReceiveProps: [],
-        UNSAFE_componentWillUpdate: []
-      };
-
-      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
-    } else {
-      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
+function startCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Host Effects)");
+  }
+}
 
-    var unsafeLifecycles = [];
-    if (
-      typeof instance.componentWillMount === "function" ||
-      typeof instance.UNSAFE_componentWillMount === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillMount");
-    }
-    if (
-      typeof instance.componentWillReceiveProps === "function" ||
-      typeof instance.UNSAFE_componentWillReceiveProps === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+function stopCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (
-      typeof instance.componentWillUpdate === "function" ||
-      typeof instance.UNSAFE_componentWillUpdate === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Host Effects: " + count + " Total)",
+      "(Committing Host Effects)",
+      null
+    );
+  }
+}
+
+function startCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Calling Lifecycle Methods)");
+  }
+}
 
-    if (unsafeLifecycles.length > 0) {
-      unsafeLifecycles.forEach(function(lifecycle) {
-        warningsForRoot[lifecycle].push(fiber);
-      });
+function stopCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Calling Lifecycle Methods: " + count + " Total)",
+      "(Calling Lifecycle Methods)",
+      null
+    );
+  }
 }
 
 var didWarnUpdateInsideUpdate = void 0;
@@ -6033,7 +5817,8 @@ function createUpdateQueue(baseState) {
     last: null,
     callbackList: null,
     hasForceUpdate: false,
-    isInitialized: false
+    isInitialized: false,
+    capturedValues: null
   };
   {
     queue.isProcessing = false;
@@ -6058,7 +5843,10 @@ function insertUpdateIntoQueue(queue, update) {
   }
 }
 
-function insertUpdateIntoFiber(fiber, update) {
+var q1 = void 0;
+var q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
   // We'll have at least one and at most two distinct update queues.
   var alternateFiber = fiber.alternate;
   var queue1 = fiber.updateQueue;
@@ -6081,6 +5869,16 @@ function insertUpdateIntoFiber(fiber, update) {
   }
   queue2 = queue2 !== queue1 ? queue2 : null;
 
+  // Use module variables instead of returning a tuple
+  q1 = queue1;
+  q2 = queue2;
+}
+
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  var queue1 = q1;
+  var queue2 = q2;
+
   // Warn if an update is scheduled from inside an updater function.
   {
     if (
@@ -6120,14 +5918,17 @@ function insertUpdateIntoFiber(fiber, update) {
 }
 
 function getUpdateExpirationTime(fiber) {
-  if (fiber.tag !== ClassComponent && fiber.tag !== HostRoot) {
-    return NoWork;
-  }
-  var updateQueue = fiber.updateQueue;
-  if (updateQueue === null) {
-    return NoWork;
+  switch (fiber.tag) {
+    case HostRoot:
+    case ClassComponent:
+      var updateQueue = fiber.updateQueue;
+      if (updateQueue === null) {
+        return NoWork;
+      }
+      return updateQueue.expirationTime;
+    default:
+      return NoWork;
   }
-  return updateQueue.expirationTime;
 }
 
 function getStateFromUpdate(update, instance, prevState, props) {
@@ -6156,6 +5957,7 @@ function processUpdateQueue(
       first: currentQueue.first,
       last: currentQueue.last,
       isInitialized: currentQueue.isInitialized,
+      capturedValues: currentQueue.capturedValues,
       // These fields are no longer valid because they were already committed.
       // Reset them.
       callbackList: null,
@@ -6257,12 +6059,24 @@ function processUpdateQueue(
       }
       _callbackList.push(update);
     }
+    if (update.capturedValue !== null) {
+      var _capturedValues = queue.capturedValues;
+      if (_capturedValues === null) {
+        queue.capturedValues = [update.capturedValue];
+      } else {
+        _capturedValues.push(update.capturedValue);
+      }
+    }
     update = update.next;
   }
 
   if (queue.callbackList !== null) {
     workInProgress.effectTag |= Callback;
-  } else if (queue.first === null && !queue.hasForceUpdate) {
+  } else if (
+    queue.first === null &&
+    !queue.hasForceUpdate &&
+    queue.capturedValues === null
+  ) {
     // The queue is empty. We can reset it.
     workInProgress.updateQueue = null;
   }
@@ -6309,23 +6123,26 @@ var isArray = Array.isArray;
 var didWarnAboutStateAssignmentForComponent = void 0;
 var didWarnAboutUndefinedDerivedState = void 0;
 var didWarnAboutUninitializedState = void 0;
-var didWarnAboutWillReceivePropsAndDerivedState = void 0;
+var didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = void 0;
+var didWarnAboutLegacyLifecyclesAndDerivedState = void 0;
 var warnOnInvalidCallback = void 0;
 
 {
-  didWarnAboutStateAssignmentForComponent = {};
-  didWarnAboutUndefinedDerivedState = {};
-  didWarnAboutUninitializedState = {};
-  didWarnAboutWillReceivePropsAndDerivedState = {};
+  didWarnAboutStateAssignmentForComponent = new Set();
+  didWarnAboutUndefinedDerivedState = new Set();
+  didWarnAboutUninitializedState = new Set();
+  didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
+  didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
 
-  var didWarnOnInvalidCallback = {};
+  var didWarnOnInvalidCallback = new Set();
 
   warnOnInvalidCallback = function(callback, callerName) {
     if (callback === null || typeof callback === "function") {
       return;
     }
     var key = callerName + "_" + callback;
-    if (!didWarnOnInvalidCallback[key]) {
+    if (!didWarnOnInvalidCallback.has(key)) {
+      didWarnOnInvalidCallback.add(key);
       warning(
         false,
         "%s(...): Expected the last optional `callback` argument to be a " +
@@ -6333,7 +6150,6 @@ var warnOnInvalidCallback = void 0;
         callerName,
         callback
       );
-      didWarnOnInvalidCallback[key] = true;
     }
   };
 
@@ -6358,14 +6174,34 @@ var warnOnInvalidCallback = void 0;
   });
   Object.freeze(fakeInternalInstance);
 }
+function callGetDerivedStateFromCatch(ctor, capturedValues) {
+  var resultState = {};
+  for (var i = 0; i < capturedValues.length; i++) {
+    var capturedValue = capturedValues[i];
+    var error = capturedValue.value;
+    var partialState = ctor.getDerivedStateFromCatch.call(null, error);
+    if (partialState !== null && partialState !== undefined) {
+      Object.assign(resultState, partialState);
+    }
+  }
+  return resultState;
+}
 
 var ReactFiberClassComponent = function(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
   memoizeState
 ) {
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged;
+
   // Class component state updater
+
   var updater = {
     isMounted: isMounted,
     enqueueSetState: function(instance, partialState, callback) {
@@ -6381,7 +6217,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: false,
         isForced: false,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6400,7 +6236,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: true,
         isForced: false,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6419,7 +6255,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: false,
         isForced: true,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6445,7 +6281,7 @@ var ReactFiberClassComponent = function(
     }
 
     var instance = workInProgress.stateNode;
-    var type = workInProgress.type;
+    var ctor = workInProgress.type;
     if (typeof instance.shouldComponentUpdate === "function") {
       startPhaseTimer(workInProgress, "shouldComponentUpdate");
       var shouldUpdate = instance.shouldComponentUpdate(
@@ -6456,18 +6292,20 @@ var ReactFiberClassComponent = function(
       stopPhaseTimer();
 
       {
-        warning(
-          shouldUpdate !== undefined,
-          "%s.shouldComponentUpdate(): Returned undefined instead of a " +
-            "boolean value. Make sure to return true or false.",
-          getComponentName(workInProgress) || "Unknown"
-        );
+        !(shouldUpdate !== undefined)
+          ? warning(
+              false,
+              "%s.shouldComponentUpdate(): Returned undefined instead of a " +
+                "boolean value. Make sure to return true or false.",
+              getComponentName(workInProgress) || "Component"
+            )
+          : void 0;
       }
 
       return shouldUpdate;
     }
 
-    if (type.prototype && type.prototype.isPureReactComponent) {
+    if (ctor.prototype && ctor.prototype.isPureReactComponent) {
       return (
         !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
       );
@@ -6480,7 +6318,7 @@ var ReactFiberClassComponent = function(
     var instance = workInProgress.stateNode;
     var type = workInProgress.type;
     {
-      var name = getComponentName(workInProgress);
+      var name = getComponentName(workInProgress) || "Component";
       var renderPresent = instance.render;
 
       if (!renderPresent) {
@@ -6505,47 +6343,57 @@ var ReactFiberClassComponent = function(
         !instance.getInitialState ||
         instance.getInitialState.isReactClassApproved ||
         instance.state;
-      warning(
-        noGetInitialStateOnES6,
-        "getInitialState was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Did you mean to define a state property instead?",
-        name
-      );
+      !noGetInitialStateOnES6
+        ? warning(
+            false,
+            "getInitialState was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Did you mean to define a state property instead?",
+            name
+          )
+        : void 0;
       var noGetDefaultPropsOnES6 =
         !instance.getDefaultProps ||
         instance.getDefaultProps.isReactClassApproved;
-      warning(
-        noGetDefaultPropsOnES6,
-        "getDefaultProps was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Use a static property to define defaultProps instead.",
-        name
-      );
+      !noGetDefaultPropsOnES6
+        ? warning(
+            false,
+            "getDefaultProps was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Use a static property to define defaultProps instead.",
+            name
+          )
+        : void 0;
       var noInstancePropTypes = !instance.propTypes;
-      warning(
-        noInstancePropTypes,
-        "propTypes was defined as an instance property on %s. Use a static " +
-          "property to define propTypes instead.",
-        name
-      );
+      !noInstancePropTypes
+        ? warning(
+            false,
+            "propTypes was defined as an instance property on %s. Use a static " +
+              "property to define propTypes instead.",
+            name
+          )
+        : void 0;
       var noInstanceContextTypes = !instance.contextTypes;
-      warning(
-        noInstanceContextTypes,
-        "contextTypes was defined as an instance property on %s. Use a static " +
-          "property to define contextTypes instead.",
-        name
-      );
+      !noInstanceContextTypes
+        ? warning(
+            false,
+            "contextTypes was defined as an instance property on %s. Use a static " +
+              "property to define contextTypes instead.",
+            name
+          )
+        : void 0;
       var noComponentShouldUpdate =
         typeof instance.componentShouldUpdate !== "function";
-      warning(
-        noComponentShouldUpdate,
-        "%s has a method called " +
-          "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
-          "The name is phrased as a question because the function is " +
-          "expected to return a value.",
-        name
-      );
+      !noComponentShouldUpdate
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
+              "The name is phrased as a question because the function is " +
+              "expected to return a value.",
+            name
+          )
+        : void 0;
       if (
         type.prototype &&
         type.prototype.isPureReactComponent &&
@@ -6561,73 +6409,128 @@ var ReactFiberClassComponent = function(
       }
       var noComponentDidUnmount =
         typeof instance.componentDidUnmount !== "function";
-      warning(
-        noComponentDidUnmount,
-        "%s has a method called " +
-          "componentDidUnmount(). But there is no such lifecycle method. " +
-          "Did you mean componentWillUnmount()?",
-        name
-      );
+      !noComponentDidUnmount
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidUnmount(). But there is no such lifecycle method. " +
+              "Did you mean componentWillUnmount()?",
+            name
+          )
+        : void 0;
       var noComponentDidReceiveProps =
         typeof instance.componentDidReceiveProps !== "function";
-      warning(
-        noComponentDidReceiveProps,
-        "%s has a method called " +
-          "componentDidReceiveProps(). But there is no such lifecycle method. " +
-          "If you meant to update the state in response to changing props, " +
-          "use componentWillReceiveProps(). If you meant to fetch data or " +
-          "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
-        name
-      );
+      !noComponentDidReceiveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidReceiveProps(). But there is no such lifecycle method. " +
+              "If you meant to update the state in response to changing props, " +
+              "use componentWillReceiveProps(). If you meant to fetch data or " +
+              "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
+            name
+          )
+        : void 0;
       var noComponentWillRecieveProps =
         typeof instance.componentWillRecieveProps !== "function";
-      warning(
-        noComponentWillRecieveProps,
-        "%s has a method called " +
-          "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
-        name
-      );
+      !noComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var noUnsafeComponentWillRecieveProps =
         typeof instance.UNSAFE_componentWillRecieveProps !== "function";
-      warning(
-        noUnsafeComponentWillRecieveProps,
-        "%s has a method called " +
-          "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
-        name
-      );
+      !noUnsafeComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var hasMutatedProps = instance.props !== workInProgress.pendingProps;
-      warning(
-        instance.props === undefined || !hasMutatedProps,
-        "%s(...): When calling super() in `%s`, make sure to pass " +
-          "up the same props that your component's constructor was passed.",
-        name,
-        name
-      );
+      !(instance.props === undefined || !hasMutatedProps)
+        ? warning(
+            false,
+            "%s(...): When calling super() in `%s`, make sure to pass " +
+              "up the same props that your component's constructor was passed.",
+            name,
+            name
+          )
+        : void 0;
       var noInstanceDefaultProps = !instance.defaultProps;
-      warning(
-        noInstanceDefaultProps,
-        "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
-          " Instead, define defaultProps as a static property on %s.",
-        name,
-        name
-      );
-    }
+      !noInstanceDefaultProps
+        ? warning(
+            false,
+            "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
+              " Instead, define defaultProps as a static property on %s.",
+            name,
+            name
+          )
+        : void 0;
 
-    var state = instance.state;
-    if (state && (typeof state !== "object" || isArray(state))) {
-      warning(
-        false,
-        "%s.state: must be set to an object or null",
-        getComponentName(workInProgress)
-      );
-    }
-    if (typeof instance.getChildContext === "function") {
-      warning(
-        typeof workInProgress.type.childContextTypes === "object",
-        "%s.getChildContext(): childContextTypes must be defined in order to " +
-          "use getChildContext().",
-        getComponentName(workInProgress)
-      );
+      if (
+        typeof instance.getSnapshotBeforeUpdate === "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
+      ) {
+        didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
+        warning(
+          false,
+          "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
+            "This component defines getSnapshotBeforeUpdate() only.",
+          getComponentName(workInProgress)
+        );
+      }
+
+      var noInstanceGetDerivedStateFromProps =
+        typeof instance.getDerivedStateFromProps !== "function";
+      !noInstanceGetDerivedStateFromProps
+        ? warning(
+            false,
+            "%s: getDerivedStateFromProps() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noInstanceGetDerivedStateFromCatch =
+        typeof instance.getDerivedStateFromCatch !== "function";
+      !noInstanceGetDerivedStateFromCatch
+        ? warning(
+            false,
+            "%s: getDerivedStateFromCatch() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noStaticGetSnapshotBeforeUpdate =
+        typeof type.getSnapshotBeforeUpdate !== "function";
+      !noStaticGetSnapshotBeforeUpdate
+        ? warning(
+            false,
+            "%s: getSnapshotBeforeUpdate() is defined as a static method " +
+              "and will be ignored. Instead, declare it as an instance method.",
+            name
+          )
+        : void 0;
+      var _state = instance.state;
+      if (_state && (typeof _state !== "object" || isArray(_state))) {
+        warning(false, "%s.state: must be set to an object or null", name);
+      }
+      if (typeof instance.getChildContext === "function") {
+        !(typeof type.childContextTypes === "object")
+          ? warning(
+              false,
+              "%s.getChildContext(): childContextTypes must be defined in order to " +
+                "use getChildContext().",
+              name
+            )
+          : void 0;
+      }
     }
   }
 
@@ -6675,8 +6578,9 @@ var ReactFiberClassComponent = function(
         typeof ctor.getDerivedStateFromProps === "function" &&
         state === null
       ) {
-        var componentName = getComponentName(workInProgress) || "Unknown";
-        if (!didWarnAboutUninitializedState[componentName]) {
+        var componentName = getComponentName(workInProgress) || "Component";
+        if (!didWarnAboutUninitializedState.has(componentName)) {
+          didWarnAboutUninitializedState.add(componentName);
           warning(
             false,
             "%s: Did not properly initialize state during construction. " +
@@ -6684,7 +6588,75 @@ var ReactFiberClassComponent = function(
             componentName,
             instance.state === null ? "null" : "undefined"
           );
-          didWarnAboutUninitializedState[componentName] = true;
+        }
+      }
+
+      // If new component APIs are defined, "unsafe" lifecycles won't be called.
+      // Warn about these lifecycles if they are present.
+      // Don't warn about react-lifecycles-compat polyfilled methods though.
+      if (
+        typeof ctor.getDerivedStateFromProps === "function" ||
+        typeof instance.getSnapshotBeforeUpdate === "function"
+      ) {
+        var foundWillMountName = null;
+        var foundWillReceivePropsName = null;
+        var foundWillUpdateName = null;
+        if (
+          typeof instance.componentWillMount === "function" &&
+          instance.componentWillMount.__suppressDeprecationWarning !== true
+        ) {
+          foundWillMountName = "componentWillMount";
+        } else if (typeof instance.UNSAFE_componentWillMount === "function") {
+          foundWillMountName = "UNSAFE_componentWillMount";
+        }
+        if (
+          typeof instance.componentWillReceiveProps === "function" &&
+          instance.componentWillReceiveProps.__suppressDeprecationWarning !==
+            true
+        ) {
+          foundWillReceivePropsName = "componentWillReceiveProps";
+        } else if (
+          typeof instance.UNSAFE_componentWillReceiveProps === "function"
+        ) {
+          foundWillReceivePropsName = "UNSAFE_componentWillReceiveProps";
+        }
+        if (
+          typeof instance.componentWillUpdate === "function" &&
+          instance.componentWillUpdate.__suppressDeprecationWarning !== true
+        ) {
+          foundWillUpdateName = "componentWillUpdate";
+        } else if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          foundWillUpdateName = "UNSAFE_componentWillUpdate";
+        }
+        if (
+          foundWillMountName !== null ||
+          foundWillReceivePropsName !== null ||
+          foundWillUpdateName !== null
+        ) {
+          var _componentName = getComponentName(workInProgress) || "Component";
+          var newApiName =
+            typeof ctor.getDerivedStateFromProps === "function"
+              ? "getDerivedStateFromProps()"
+              : "getSnapshotBeforeUpdate()";
+          if (
+            !didWarnAboutLegacyLifecyclesAndDerivedState.has(_componentName)
+          ) {
+            didWarnAboutLegacyLifecyclesAndDerivedState.add(_componentName);
+            warning(
+              false,
+              "Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n" +
+                "%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n" +
+                "The above lifecycles should be removed. Learn more about this warning here:\n" +
+                "https://fb.me/react-async-component-lifecycle-hooks",
+              _componentName,
+              newApiName,
+              foundWillMountName !== null ? "\n  " + foundWillMountName : "",
+              foundWillReceivePropsName !== null
+                ? "\n  " + foundWillReceivePropsName
+                : "",
+              foundWillUpdateName !== null ? "\n  " + foundWillUpdateName : ""
+            );
+          }
         }
       }
     }
@@ -6694,7 +6666,8 @@ var ReactFiberClassComponent = function(
     var partialState = callGetDerivedStateFromProps(
       workInProgress,
       instance,
-      props
+      props,
+      state
     );
 
     if (partialState !== null && partialState !== undefined) {
@@ -6737,7 +6710,7 @@ var ReactFiberClassComponent = function(
           "%s.componentWillMount(): Assigning directly to this.state is " +
             "deprecated (except inside a component's " +
             "constructor). Use setState instead.",
-          getComponentName(workInProgress)
+          getComponentName(workInProgress) || "Component"
         );
       }
       updater.enqueueReplaceState(instance, instance.state, null);
@@ -6763,7 +6736,8 @@ var ReactFiberClassComponent = function(
     if (instance.state !== oldState) {
       {
         var componentName = getComponentName(workInProgress) || "Component";
-        if (!didWarnAboutStateAssignmentForComponent[componentName]) {
+        if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
+          didWarnAboutStateAssignmentForComponent.add(componentName);
           warning(
             false,
             "%s.componentWillReceiveProps(): Assigning directly to " +
@@ -6771,244 +6745,313 @@ var ReactFiberClassComponent = function(
               "constructor). Use setState instead.",
             componentName
           );
-          didWarnAboutStateAssignmentForComponent[componentName] = true;
         }
       }
       updater.enqueueReplaceState(instance, instance.state, null);
     }
   }
 
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
     var type = workInProgress.type;
 
     if (typeof type.getDerivedStateFromProps === "function") {
-      {
-        // Don't warn about react-lifecycles-compat polyfilled components
-        if (
-          (typeof instance.componentWillReceiveProps === "function" &&
-            instance.componentWillReceiveProps.__suppressDeprecationWarning !==
-              true) ||
-          typeof instance.UNSAFE_componentWillReceiveProps === "function"
-        ) {
-          var componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutWillReceivePropsAndDerivedState[componentName]) {
-            warning(
-              false,
-              "%s: Defines both componentWillReceiveProps() and static " +
-                "getDerivedStateFromProps() methods. We recommend using " +
-                "only getDerivedStateFromProps().",
-              componentName
-            );
-            didWarnAboutWillReceivePropsAndDerivedState[componentName] = true;
-          }
-        }
-      }
-
       if (
         debugRenderPhaseSideEffects ||
         (debugRenderPhaseSideEffectsForStrictMode &&
           workInProgress.mode & StrictMode)
       ) {
         // Invoke method an extra time to help detect side-effects.
-        type.getDerivedStateFromProps.call(
-          null,
-          props,
-          workInProgress.memoizedState
-        );
+        type.getDerivedStateFromProps.call(null, nextProps, prevState);
       }
 
       var partialState = type.getDerivedStateFromProps.call(
         null,
-        props,
-        workInProgress.memoizedState
+        nextProps,
+        prevState
       );
 
       {
         if (partialState === undefined) {
-          var _componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutUndefinedDerivedState[_componentName]) {
+          var componentName = getComponentName(workInProgress) || "Component";
+          if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
+            didWarnAboutUndefinedDerivedState.add(componentName);
             warning(
               false,
               "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
                 "You have returned undefined.",
-              _componentName
+              componentName
             );
-            didWarnAboutUndefinedDerivedState[_componentName] = _componentName;
           }
         }
       }
 
       return partialState;
     }
-  }
-
-  // Invokes the mount life-cycles on a previously never rendered instance.
-  function mountClassInstance(workInProgress, renderExpirationTime) {
-    var current = workInProgress.alternate;
+  }
+
+  // Invokes the mount life-cycles on a previously never rendered instance.
+  function mountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var current = workInProgress.alternate;
+
+    {
+      checkClassInstance(workInProgress);
+    }
+
+    var instance = workInProgress.stateNode;
+    var props = workInProgress.pendingProps;
+    var unmaskedContext = getUnmaskedContext(workInProgress);
+
+    instance.props = props;
+    instance.state = workInProgress.memoizedState;
+    instance.refs = emptyObject;
+    instance.context = getMaskedContext(workInProgress, unmaskedContext);
+
+    {
+      if (workInProgress.mode & StrictMode) {
+        ReactStrictModeWarnings.recordUnsafeLifecycleWarnings(
+          workInProgress,
+          instance
+        );
+      }
+
+      if (warnAboutDeprecatedLifecycles) {
+        ReactStrictModeWarnings.recordDeprecationWarnings(
+          workInProgress,
+          instance
+        );
+      }
+    }
+
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
+    if (
+      typeof ctor.getDerivedStateFromProps !== "function" &&
+      typeof instance.getSnapshotBeforeUpdate !== "function" &&
+      (typeof instance.UNSAFE_componentWillMount === "function" ||
+        typeof instance.componentWillMount === "function")
+    ) {
+      callComponentWillMount(workInProgress, instance);
+      // If we had additional state updates during this life-cycle, let's
+      // process them now.
+      var updateQueue = workInProgress.updateQueue;
+      if (updateQueue !== null) {
+        instance.state = processUpdateQueue(
+          current,
+          workInProgress,
+          updateQueue,
+          instance,
+          props,
+          renderExpirationTime
+        );
+      }
+    }
+    if (typeof instance.componentDidMount === "function") {
+      workInProgress.effectTag |= Update;
+    }
+  }
+
+  function resumeMountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var instance = workInProgress.stateNode;
+    resetInputPointers(workInProgress, instance);
+
+    var oldProps = workInProgress.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+    var oldContext = instance.context;
+    var newUnmaskedContext = getUnmaskedContext(workInProgress);
+    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
+    // Note: During these life-cycles, instance.props/instance.state are what
+    // ever the previously attempted to render - not the "current". However,
+    // during componentDidUpdate we pass the "current" props.
+
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
+    if (
+      !hasNewLifecycles &&
+      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
+        typeof instance.componentWillReceiveProps === "function")
+    ) {
+      if (oldProps !== newProps || oldContext !== newContext) {
+        callComponentWillReceiveProps(
+          workInProgress,
+          instance,
+          newProps,
+          newContext
+        );
+      }
+    }
+
+    // Compute the next state using the memoized state and the update queue.
+    var oldState = workInProgress.memoizedState;
+    // TODO: Previous state can be null.
+    var newState = void 0;
+    var derivedStateFromCatch = void 0;
+    if (workInProgress.updateQueue !== null) {
+      newState = processUpdateQueue(
+        null,
+        workInProgress,
+        workInProgress.updateQueue,
+        instance,
+        newProps,
+        renderExpirationTime
+      );
+
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
+      }
+    } else {
+      newState = oldState;
+    }
 
-    {
-      checkClassInstance(workInProgress);
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
     }
 
-    var instance = workInProgress.stateNode;
-    var props = workInProgress.pendingProps;
-    var unmaskedContext = getUnmaskedContext(workInProgress);
-
-    instance.props = props;
-    instance.state = workInProgress.memoizedState;
-    instance.refs = emptyObject;
-    instance.context = getMaskedContext(workInProgress, unmaskedContext);
-
-    {
-      if (workInProgress.mode & StrictMode) {
-        ReactStrictModeWarnings.recordUnsafeLifecycleWarnings(
-          workInProgress,
-          instance
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue = workInProgress.updateQueue;
+      if (_updateQueue !== null) {
+        _updateQueue.baseState = Object.assign(
+          {},
+          _updateQueue.baseState,
+          derivedStateFromProps
         );
       }
-
-      if (warnAboutDeprecatedLifecycles) {
-        ReactStrictModeWarnings.recordDeprecationWarnings(
-          workInProgress,
-          instance
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue2 = workInProgress.updateQueue;
+      if (_updateQueue2 !== null) {
+        _updateQueue2.baseState = Object.assign(
+          {},
+          _updateQueue2.baseState,
+          derivedStateFromCatch
         );
       }
     }
 
-    // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
     if (
-      (typeof instance.UNSAFE_componentWillMount === "function" ||
-        typeof instance.componentWillMount === "function") &&
-      typeof workInProgress.type.getDerivedStateFromProps !== "function"
+      oldProps === newProps &&
+      oldState === newState &&
+      !hasContextChanged() &&
+      !(
+        workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate
+      )
     ) {
-      callComponentWillMount(workInProgress, instance);
-      // If we had additional state updates during this life-cycle, let's
-      // process them now.
-      var updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        instance.state = processUpdateQueue(
-          current,
-          workInProgress,
-          updateQueue,
-          instance,
-          props,
-          renderExpirationTime
-        );
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
       }
+      return false;
     }
-    if (typeof instance.componentDidMount === "function") {
-      workInProgress.effectTag |= Update;
+
+    var shouldUpdate = checkShouldComponentUpdate(
+      workInProgress,
+      oldProps,
+      newProps,
+      oldState,
+      newState,
+      newContext
+    );
+
+    if (shouldUpdate) {
+      // In order to support react-lifecycles-compat polyfilled components,
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
+      if (
+        !hasNewLifecycles &&
+        (typeof instance.UNSAFE_componentWillMount === "function" ||
+          typeof instance.componentWillMount === "function")
+      ) {
+        startPhaseTimer(workInProgress, "componentWillMount");
+        if (typeof instance.componentWillMount === "function") {
+          instance.componentWillMount();
+        }
+        if (typeof instance.UNSAFE_componentWillMount === "function") {
+          instance.UNSAFE_componentWillMount();
+        }
+        stopPhaseTimer();
+      }
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
+      }
+    } else {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
+      }
+
+      // If shouldComponentUpdate returned false, we should still update the
+      // memoized props/state to indicate that this work can be reused.
+      memoizeProps(workInProgress, newProps);
+      memoizeState(workInProgress, newState);
     }
-  }
 
-  // Called on a preexisting class instance. Returns false if a resumed render
-  // could be reused.
-  // function resumeMountClassInstance(
-  //   workInProgress: Fiber,
-  //   priorityLevel: PriorityLevel,
-  // ): boolean {
-  //   const instance = workInProgress.stateNode;
-  //   resetInputPointers(workInProgress, instance);
-
-  //   let newState = workInProgress.memoizedState;
-  //   let newProps = workInProgress.pendingProps;
-  //   if (!newProps) {
-  //     // If there isn't any new props, then we'll reuse the memoized props.
-  //     // This could be from already completed work.
-  //     newProps = workInProgress.memoizedProps;
-  //     invariant(
-  //       newProps != null,
-  //       'There should always be pending or memoized props. This error is ' +
-  //         'likely caused by a bug in React. Please file an issue.',
-  //     );
-  //   }
-  //   const newUnmaskedContext = getUnmaskedContext(workInProgress);
-  //   const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
-
-  //   const oldContext = instance.context;
-  //   const oldProps = workInProgress.memoizedProps;
-
-  //   if (
-  //     typeof instance.componentWillReceiveProps === 'function' &&
-  //     (oldProps !== newProps || oldContext !== newContext)
-  //   ) {
-  //     callComponentWillReceiveProps(
-  //       workInProgress,
-  //       instance,
-  //       newProps,
-  //       newContext,
-  //     );
-  //   }
-
-  //   // Process the update queue before calling shouldComponentUpdate
-  //   const updateQueue = workInProgress.updateQueue;
-  //   if (updateQueue !== null) {
-  //     newState = processUpdateQueue(
-  //       workInProgress,
-  //       updateQueue,
-  //       instance,
-  //       newState,
-  //       newProps,
-  //       priorityLevel,
-  //     );
-  //   }
-
-  //   // TODO: Should we deal with a setState that happened after the last
-  //   // componentWillMount and before this componentWillMount? Probably
-  //   // unsupported anyway.
-
-  //   if (
-  //     !checkShouldComponentUpdate(
-  //       workInProgress,
-  //       workInProgress.memoizedProps,
-  //       newProps,
-  //       workInProgress.memoizedState,
-  //       newState,
-  //       newContext,
-  //     )
-  //   ) {
-  //     // Update the existing instance's state, props, and context pointers even
-  //     // though we're bailing out.
-  //     instance.props = newProps;
-  //     instance.state = newState;
-  //     instance.context = newContext;
-  //     return false;
-  //   }
-
-  //   // Update the input pointers now so that they are correct when we call
-  //   // componentWillMount
-  //   instance.props = newProps;
-  //   instance.state = newState;
-  //   instance.context = newContext;
-
-  //   if (typeof instance.componentWillMount === 'function') {
-  //     callComponentWillMount(workInProgress, instance);
-  //     // componentWillMount may have called setState. Process the update queue.
-  //     const newUpdateQueue = workInProgress.updateQueue;
-  //     if (newUpdateQueue !== null) {
-  //       newState = processUpdateQueue(
-  //         workInProgress,
-  //         newUpdateQueue,
-  //         instance,
-  //         newState,
-  //         newProps,
-  //         priorityLevel,
-  //       );
-  //     }
-  //   }
-
-  //   if (typeof instance.componentDidMount === 'function') {
-  //     workInProgress.effectTag |= Update;
-  //   }
-
-  //   instance.state = newState;
-
-  //   return true;
-  // }
+    // Update the existing instance's state, props, and context pointers even
+    // if shouldComponentUpdate returns false.
+    instance.props = newProps;
+    instance.state = newState;
+    instance.context = newContext;
+
+    return shouldUpdate;
+  }
 
   // Invokes the update life-cycles and returns false if it shouldn't rerender.
   function updateClassInstance(current, workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
     var instance = workInProgress.stateNode;
     resetInputPointers(workInProgress, instance);
 
@@ -7018,16 +7061,20 @@ var ReactFiberClassComponent = function(
     var newUnmaskedContext = getUnmaskedContext(workInProgress);
     var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
     // Note: During these life-cycles, instance.props/instance.state are what
     // ever the previously attempted to render - not the "current". However,
     // during componentDidUpdate we pass the "current" props.
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      !hasNewLifecycles &&
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function") &&
-      typeof workInProgress.type.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillReceiveProps === "function")
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -7039,19 +7086,12 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var partialState = void 0;
-    if (oldProps !== newProps) {
-      partialState = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps
-      );
-    }
-
     // Compute the next state using the memoized state and the update queue.
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
     var newState = void 0;
+    var derivedStateFromCatch = void 0;
+
     if (workInProgress.updateQueue !== null) {
       newState = processUpdateQueue(
         current,
@@ -7061,18 +7101,79 @@ var ReactFiberClassComponent = function(
         newProps,
         renderExpirationTime
       );
+
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
+      }
     } else {
       newState = oldState;
     }
 
-    if (partialState !== null && partialState !== undefined) {
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
+    }
+
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue3 = workInProgress.updateQueue;
+      if (_updateQueue3 !== null) {
+        _updateQueue3.baseState = Object.assign(
+          {},
+          _updateQueue3.baseState,
+          derivedStateFromProps
+        );
+      }
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
       // Instead, just synchronously merge the returned state into the instance.
       newState =
         newState === null || newState === undefined
-          ? partialState
-          : Object.assign({}, newState, partialState);
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue4 = workInProgress.updateQueue;
+      if (_updateQueue4 !== null) {
+        _updateQueue4.baseState = Object.assign(
+          {},
+          _updateQueue4.baseState,
+          derivedStateFromCatch
+        );
+      }
     }
 
     if (
@@ -7094,6 +7195,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
       return false;
     }
 
@@ -7108,11 +7217,11 @@ var ReactFiberClassComponent = function(
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
+        !hasNewLifecycles &&
         (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function") &&
-        typeof workInProgress.type.getDerivedStateFromProps !== "function"
+          typeof instance.componentWillUpdate === "function")
       ) {
         startPhaseTimer(workInProgress, "componentWillUpdate");
         if (typeof instance.componentWillUpdate === "function") {
@@ -7126,6 +7235,9 @@ var ReactFiberClassComponent = function(
       if (typeof instance.componentDidUpdate === "function") {
         workInProgress.effectTag |= Update;
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        workInProgress.effectTag |= Snapshot;
+      }
     } else {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
@@ -7137,6 +7249,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
 
       // If shouldComponentUpdate returned false, we should still update the
       // memoized props/state to indicate that this work can be reused.
@@ -7158,7 +7278,7 @@ var ReactFiberClassComponent = function(
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: constructClassInstance,
     mountClassInstance: mountClassInstance,
-    // resumeMountClassInstance,
+    resumeMountClassInstance: resumeMountClassInstance,
     updateClassInstance: updateClassInstance
   };
 };
@@ -7976,13 +8096,15 @@ function ChildReconciler(shouldTrackSideEffects) {
       if (typeof newChildrenIterable.entries === "function") {
         var possibleMap = newChildrenIterable;
         if (possibleMap.entries === iteratorFn) {
-          warning(
-            didWarnAboutMaps,
-            "Using Maps as children is unsupported and will likely yield " +
-              "unexpected results. Convert it to a sequence/iterable of keyed " +
-              "ReactElements instead.%s",
-            getCurrentFiberStackAddendum$1()
-          );
+          !didWarnAboutMaps
+            ? warning(
+                false,
+                "Using Maps as children is unsupported and will likely yield " +
+                  "unexpected results. Convert it to a sequence/iterable of keyed " +
+                  "ReactElements instead.%s",
+                getCurrentFiberStackAddendum$1()
+              )
+            : void 0;
           didWarnAboutMaps = true;
         }
       }
@@ -8424,71 +8546,6 @@ function cloneChildFibers(current, workInProgress) {
   newChild.sibling = null;
 }
 
-var changedBitsStack = [];
-var currentValueStack = [];
-var stack = [];
-var index$1 = -1;
-
-var rendererSigil = void 0;
-{
-  // Use this to detect multiple renderers using the same context
-  rendererSigil = {};
-}
-
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context.changedBits;
-  currentValueStack[index$1] = context.currentValue;
-  stack[index$1] = providerFiber;
-  context.currentValue = providerFiber.pendingProps.value;
-  context.changedBits = providerFiber.stateNode;
-
-  {
-    warning(
-      context._currentRenderer === null ||
-        context._currentRenderer === rendererSigil,
-      "Detected multiple renderers concurrently rendering the " +
-        "same context provider. This is currently unsupported."
-    );
-    context._currentRenderer = rendererSigil;
-  }
-}
-
-function popProvider(providerFiber) {
-  {
-    warning(
-      index$1 > -1 && providerFiber === stack[index$1],
-      "Unexpected pop."
-    );
-  }
-  var changedBits = changedBitsStack[index$1];
-  var currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  index$1 -= 1;
-  var context = providerFiber.type.context;
-  context.currentValue = currentValue;
-  context.changedBits = changedBits;
-}
-
-function resetProviderStack() {
-  for (var i = index$1; i > -1; i--) {
-    var providerFiber = stack[i];
-    var context = providerFiber.type.context;
-    context.currentValue = context.defaultValue;
-    context.changedBits = 0;
-    changedBitsStack[i] = null;
-    currentValueStack[i] = null;
-    stack[i] = null;
-    {
-      context._currentRenderer = null;
-    }
-  }
-  index$1 = -1;
-}
-
 var didWarnAboutBadClass = void 0;
 var didWarnAboutGetDerivedStateOnFunctionalComponent = void 0;
 var didWarnAboutStatelessRefs = void 0;
@@ -8502,6 +8559,8 @@ var didWarnAboutStatelessRefs = void 0;
 var ReactFiberBeginWork = function(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -8510,12 +8569,20 @@ var ReactFiberBeginWork = function(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree;
   var pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer;
+  var pushProvider = newContext.pushProvider;
+  var getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider;
   var enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
 
   var _ReactFiberClassCompo = ReactFiberClassComponent(
+      legacyContext,
       scheduleWork,
       computeExpirationForFiber,
       memoizeProps,
@@ -8526,6 +8593,7 @@ var ReactFiberBeginWork = function(
       _ReactFiberClassCompo.callGetDerivedStateFromProps,
     constructClassInstance = _ReactFiberClassCompo.constructClassInstance,
     mountClassInstance = _ReactFiberClassCompo.mountClassInstance,
+    resumeMountClassInstance = _ReactFiberClassCompo.resumeMountClassInstance,
     updateClassInstance = _ReactFiberClassCompo.updateClassInstance;
 
   // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
@@ -8572,9 +8640,17 @@ var ReactFiberBeginWork = function(
     }
   }
 
+  function updateForwardRef(current, workInProgress) {
+    var render = workInProgress.type.render;
+    var nextChildren = render(workInProgress.pendingProps, workInProgress.ref);
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
+    return workInProgress.child;
+  }
+
   function updateFragment(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -8587,7 +8663,7 @@ var ReactFiberBeginWork = function(
 
   function updateMode(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps.children;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (
@@ -8616,7 +8692,7 @@ var ReactFiberBeginWork = function(
     var fn = workInProgress.type;
     var nextProps = workInProgress.pendingProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else {
@@ -8649,20 +8725,21 @@ var ReactFiberBeginWork = function(
     // Push context providers early to prevent context stack mismatches.
     // During mounting we don't know the child context yet as the instance doesn't exist.
     // We will invalidate the child context in finishClassComponent() right after rendering.
-    var hasContext = pushContextProvider(workInProgress);
-
+    var hasContext = pushLegacyContextProvider(workInProgress);
     var shouldUpdate = void 0;
     if (current === null) {
-      if (!workInProgress.stateNode) {
+      if (workInProgress.stateNode === null) {
         // In the initial pass we might need to construct the instance.
         constructClassInstance(workInProgress, workInProgress.pendingProps);
         mountClassInstance(workInProgress, renderExpirationTime);
 
         shouldUpdate = true;
       } else {
-        invariant(false, "Resuming work not yet implemented.");
         // In a resume, we'll already have an instance we can reuse.
-        // shouldUpdate = resumeMountClassInstance(workInProgress, renderExpirationTime);
+        shouldUpdate = resumeMountClassInstance(
+          workInProgress,
+          renderExpirationTime
+        );
       }
     } else {
       shouldUpdate = updateClassInstance(
@@ -8671,11 +8748,23 @@ var ReactFiberBeginWork = function(
         renderExpirationTime
       );
     }
+
+    // We processed the update queue inside updateClassInstance. It may have
+    // included some errors that were dispatched during the commit phase.
+    // TODO: Refactor class components so this is less awkward.
+    var didCaptureError = false;
+    var updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null && updateQueue.capturedValues !== null) {
+      shouldUpdate = true;
+      didCaptureError = true;
+    }
     return finishClassComponent(
       current,
       workInProgress,
       shouldUpdate,
-      hasContext
+      hasContext,
+      didCaptureError,
+      renderExpirationTime
     );
   }
 
@@ -8683,12 +8772,14 @@ var ReactFiberBeginWork = function(
     current,
     workInProgress,
     shouldUpdate,
-    hasContext
+    hasContext,
+    didCaptureError,
+    renderExpirationTime
   ) {
     // Refs should update even if shouldComponentUpdate returns false
     markRef(current, workInProgress);
 
-    if (!shouldUpdate) {
+    if (!shouldUpdate && !didCaptureError) {
       // Context providers should defer to sCU for rendering
       if (hasContext) {
         invalidateContextProvider(workInProgress, false);
@@ -8697,26 +8788,60 @@ var ReactFiberBeginWork = function(
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
 
+    var ctor = workInProgress.type;
     var instance = workInProgress.stateNode;
 
     // Rerender
     ReactCurrentOwner.current = workInProgress;
     var nextChildren = void 0;
-    {
-      ReactDebugCurrentFiber.setCurrentPhase("render");
-      nextChildren = instance.render();
-      if (
-        debugRenderPhaseSideEffects ||
-        (debugRenderPhaseSideEffectsForStrictMode &&
-          workInProgress.mode & StrictMode)
-      ) {
-        instance.render();
+    if (
+      didCaptureError &&
+      (!enableGetDerivedStateFromCatch ||
+        typeof ctor.getDerivedStateFromCatch !== "function")
+    ) {
+      // If we captured an error, but getDerivedStateFrom catch is not defined,
+      // unmount all the children. componentDidCatch will schedule an update to
+      // re-render a fallback. This is temporary until we migrate everyone to
+      // the new API.
+      // TODO: Warn in a future release.
+      nextChildren = null;
+    } else {
+      {
+        ReactDebugCurrentFiber.setCurrentPhase("render");
+        nextChildren = instance.render();
+        if (
+          debugRenderPhaseSideEffects ||
+          (debugRenderPhaseSideEffectsForStrictMode &&
+            workInProgress.mode & StrictMode)
+        ) {
+          instance.render();
+        }
+        ReactDebugCurrentFiber.setCurrentPhase(null);
       }
-      ReactDebugCurrentFiber.setCurrentPhase(null);
     }
+
     // React DevTools reads this flag.
     workInProgress.effectTag |= PerformedWork;
-    reconcileChildren(current, workInProgress, nextChildren);
+    if (didCaptureError) {
+      // If we're recovering from an error, reconcile twice: first to delete
+      // all the existing children.
+      reconcileChildrenAtExpirationTime(
+        current,
+        workInProgress,
+        null,
+        renderExpirationTime
+      );
+      workInProgress.child = null;
+      // Now we can continue reconciling like normal. This has the effect of
+      // remounting all children regardless of whether their their
+      // identity matches.
+    }
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
     // Memoize props and state using the values we just used to render.
     // TODO: Restructure so we never read values from the instance.
     memoizeState(workInProgress, instance.state);
@@ -8758,13 +8883,21 @@ var ReactFiberBeginWork = function(
         null,
         renderExpirationTime
       );
-      if (prevState === state) {
+      memoizeState(workInProgress, state);
+      updateQueue = workInProgress.updateQueue;
+
+      var element = void 0;
+      if (updateQueue !== null && updateQueue.capturedValues !== null) {
+        // There's an uncaught error. Unmount the whole root.
+        element = null;
+      } else if (prevState === state) {
         // If the state is the same as before, that's a bailout because we had
         // no work that expires at this time.
         resetHydrationState();
         return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      } else {
+        element = state.element;
       }
-      var element = state.element;
       var root = workInProgress.stateNode;
       if (
         (current === null || current.child === null) &&
@@ -8817,11 +8950,22 @@ var ReactFiberBeginWork = function(
     var nextProps = workInProgress.pendingProps;
     var prevProps = current !== null ? current.memoizedProps : null;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (memoizedProps === nextProps) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      var isHidden =
+        workInProgress.mode & AsyncMode &&
+        shouldDeprioritizeSubtree(type, nextProps);
+      if (isHidden) {
+        // Before bailing out, make sure we've deprioritized a hidden component.
+        workInProgress.expirationTime = Never;
+      }
+      if (!isHidden || renderExpirationTime !== Never) {
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      }
+      // If we're rendering a hidden node at hidden priority, don't bailout. The
+      // parent is complete, but the children may not be.
     }
 
     var nextChildren = nextProps.children;
@@ -8850,6 +8994,7 @@ var ReactFiberBeginWork = function(
       // Down-prioritize the children.
       workInProgress.expirationTime = Never;
       // Bailout and come back to this fiber later.
+      workInProgress.memoizedProps = nextProps;
       return null;
     }
 
@@ -8925,7 +9070,8 @@ var ReactFiberBeginWork = function(
         var partialState = callGetDerivedStateFromProps(
           workInProgress,
           value,
-          props
+          props,
+          workInProgress.memoizedState
         );
 
         if (partialState !== null && partialState !== undefined) {
@@ -8940,10 +9086,17 @@ var ReactFiberBeginWork = function(
       // Push context providers early to prevent context stack mismatches.
       // During mounting we don't know the child context yet as the instance doesn't exist.
       // We will invalidate the child context in finishClassComponent() right after rendering.
-      var hasContext = pushContextProvider(workInProgress);
+      var hasContext = pushLegacyContextProvider(workInProgress);
       adoptClassInstance(workInProgress, value);
       mountClassInstance(workInProgress, renderExpirationTime);
-      return finishClassComponent(current, workInProgress, true, hasContext);
+      return finishClassComponent(
+        current,
+        workInProgress,
+        true,
+        hasContext,
+        false,
+        renderExpirationTime
+      );
     } else {
       // Proceed under the assumption that this is a functional component
       workInProgress.tag = FunctionalComponent;
@@ -8951,11 +9104,13 @@ var ReactFiberBeginWork = function(
         var _Component = workInProgress.type;
 
         if (_Component) {
-          warning(
-            !_Component.childContextTypes,
-            "%s(...): childContextTypes cannot be defined on a functional component.",
-            _Component.displayName || _Component.name || "Component"
-          );
+          !!_Component.childContextTypes
+            ? warning(
+                false,
+                "%s(...): childContextTypes cannot be defined on a functional component.",
+                _Component.displayName || _Component.name || "Component"
+              )
+            : void 0;
         }
         if (workInProgress.ref !== null) {
           var info = "";
@@ -9006,7 +9161,7 @@ var ReactFiberBeginWork = function(
 
   function updateCallComponent(current, workInProgress, renderExpirationTime) {
     var nextProps = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextProps) {
@@ -9049,7 +9204,7 @@ var ReactFiberBeginWork = function(
   ) {
     pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -9083,6 +9238,10 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var fiber = workInProgress.child;
+    if (fiber !== null) {
+      // Set the return pointer of the child to the work-in-progress fiber.
+      fiber["return"] = workInProgress;
+    }
     while (fiber !== null) {
       var nextFiber = void 0;
       // Visit this fiber.
@@ -9170,12 +9329,12 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var providerType = workInProgress.type;
-    var context = providerType.context;
+    var context = providerType._context;
 
     var newProps = workInProgress.pendingProps;
     var oldProps = workInProgress.memoizedProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (oldProps === newProps) {
@@ -9183,48 +9342,72 @@ var ReactFiberBeginWork = function(
       pushProvider(workInProgress);
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
-    workInProgress.memoizedProps = newProps;
 
     var newValue = newProps.value;
+    workInProgress.memoizedProps = newProps;
 
     var changedBits = void 0;
     if (oldProps === null) {
       // Initial render
       changedBits = MAX_SIGNED_31_BIT_INT;
     } else {
-      var oldValue = oldProps.value;
-      // Use Object.is to compare the new context value to the old value.
-      // Inlined Object.is polyfill.
-      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-      if (
-        (oldValue === newValue &&
-          (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
-        (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
-      ) {
-        // No change.
-        changedBits = 0;
-      } else {
-        changedBits =
-          typeof context.calculateChangedBits === "function"
-            ? context.calculateChangedBits(oldValue, newValue)
-            : MAX_SIGNED_31_BIT_INT;
-        {
-          warning(
-            (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
-            "calculateChangedBits: Expected the return value to be a " +
-              "31-bit integer. Instead received: %s",
-            changedBits
-          );
+      if (oldProps.value === newProps.value) {
+        // No change. Bailout early if children are the same.
+        if (oldProps.children === newProps.children) {
+          workInProgress.stateNode = 0;
+          pushProvider(workInProgress);
+          return bailoutOnAlreadyFinishedWork(current, workInProgress);
         }
-        changedBits |= 0;
-
-        if (changedBits !== 0) {
-          propagateContextChange(
-            workInProgress,
-            context,
-            changedBits,
-            renderExpirationTime
-          );
+        changedBits = 0;
+      } else {
+        var oldValue = oldProps.value;
+        // Use Object.is to compare the new context value to the old value.
+        // Inlined Object.is polyfill.
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+        if (
+          (oldValue === newValue &&
+            (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
+          (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
+        ) {
+          // No change. Bailout early if children are the same.
+          if (oldProps.children === newProps.children) {
+            workInProgress.stateNode = 0;
+            pushProvider(workInProgress);
+            return bailoutOnAlreadyFinishedWork(current, workInProgress);
+          }
+          changedBits = 0;
+        } else {
+          changedBits =
+            typeof context._calculateChangedBits === "function"
+              ? context._calculateChangedBits(oldValue, newValue)
+              : MAX_SIGNED_31_BIT_INT;
+          {
+            !((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits)
+              ? warning(
+                  false,
+                  "calculateChangedBits: Expected the return value to be a " +
+                    "31-bit integer. Instead received: %s",
+                  changedBits
+                )
+              : void 0;
+          }
+          changedBits |= 0;
+
+          if (changedBits === 0) {
+            // No change. Bailout early if children are the same.
+            if (oldProps.children === newProps.children) {
+              workInProgress.stateNode = 0;
+              pushProvider(workInProgress);
+              return bailoutOnAlreadyFinishedWork(current, workInProgress);
+            }
+          } else {
+            propagateContextChange(
+              workInProgress,
+              context,
+              changedBits,
+              renderExpirationTime
+            );
+          }
         }
       }
     }
@@ -9232,9 +9415,6 @@ var ReactFiberBeginWork = function(
     workInProgress.stateNode = changedBits;
     pushProvider(workInProgress);
 
-    if (oldProps !== null && oldProps.children === newProps.children) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
     var newChildren = newProps.children;
     reconcileChildren(current, workInProgress, newChildren);
     return workInProgress.child;
@@ -9247,11 +9427,28 @@ var ReactFiberBeginWork = function(
   ) {
     var context = workInProgress.type;
     var newProps = workInProgress.pendingProps;
+    var oldProps = workInProgress.memoizedProps;
+
+    var newValue = context._currentValue;
+    var changedBits = context._changedBits;
+
+    if (hasLegacyContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (changedBits === 0 && oldProps === newProps) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    workInProgress.memoizedProps = newProps;
 
-    var newValue = context.currentValue;
-    var changedBits = context.changedBits;
+    var observedBits = newProps.unstable_observedBits;
+    if (observedBits === undefined || observedBits === null) {
+      // Subscribe to all changes by default
+      observedBits = MAX_SIGNED_31_BIT_INT;
+    }
+    // Store the observedBits on the fiber's stateNode for quick access.
+    workInProgress.stateNode = observedBits;
 
-    if (changedBits !== 0) {
+    if ((changedBits & observedBits) !== 0) {
       // Context change propagation stops at matching consumers, for time-
       // slicing. Continue the propagation here.
       propagateContextChange(
@@ -9261,16 +9458,24 @@ var ReactFiberBeginWork = function(
         renderExpirationTime
       );
     }
+    // There is no bailout on `children` equality because we expect people
+    // to often pass a bound method as a child, but it may reference
+    // `this.state` or `this.props` (and thus needs to re-render on `setState`).
 
-    // Store the observedBits on the fiber's stateNode for quick access.
-    var observedBits = newProps.observedBits;
-    if (observedBits === undefined || observedBits === null) {
-      // Subscribe to all changes by default
-      observedBits = MAX_SIGNED_31_BIT_INT;
+    var render = newProps.children;
+
+    {
+      !(typeof render === "function")
+        ? warning(
+            false,
+            "A context consumer was rendered with multiple children, or a child " +
+              "that isn't a function. A context consumer expects a single child " +
+              "that is a function. If you did pass a function, make sure there " +
+              "is no trailing or leading whitespace around it."
+          )
+        : void 0;
     }
-    workInProgress.stateNode = observedBits;
 
-    var render = newProps.children;
     var newChildren = render(newValue);
     reconcileChildren(current, workInProgress, newChildren);
     return workInProgress.child;
@@ -9326,7 +9531,7 @@ var ReactFiberBeginWork = function(
         pushHostRootContext(workInProgress);
         break;
       case ClassComponent:
-        pushContextProvider(workInProgress);
+        pushLegacyContextProvider(workInProgress);
         break;
       case HostPortal:
         pushHostContainer(
@@ -9407,6 +9612,8 @@ var ReactFiberBeginWork = function(
           workInProgress,
           renderExpirationTime
         );
+      case ForwardRef:
+        return updateForwardRef(current, workInProgress);
       case Fragment:
         return updateFragment(current, workInProgress);
       case Mode:
@@ -9432,74 +9639,18 @@ var ReactFiberBeginWork = function(
     }
   }
 
-  function beginFailedWork(current, workInProgress, renderExpirationTime) {
-    // Push context providers here to avoid a push/pop context mismatch.
-    switch (workInProgress.tag) {
-      case ClassComponent:
-        pushContextProvider(workInProgress);
-        break;
-      case HostRoot:
-        pushHostRootContext(workInProgress);
-        break;
-      default:
-        invariant(
-          false,
-          "Invalid type of work. This error is likely caused by a bug in React. " +
-            "Please file an issue."
-        );
-    }
-
-    // Add an error effect so we can handle the error during the commit phase
-    workInProgress.effectTag |= Err;
-
-    // This is a weird case where we do "resume" work — work that failed on
-    // our first attempt. Because we no longer have a notion of "progressed
-    // deletions," reset the child to the current child to make sure we delete
-    // it again. TODO: Find a better way to handle this, perhaps during a more
-    // general overhaul of error handling.
-    if (current === null) {
-      workInProgress.child = null;
-    } else if (workInProgress.child !== current.child) {
-      workInProgress.child = current.child;
-    }
-
-    if (
-      workInProgress.expirationTime === NoWork ||
-      workInProgress.expirationTime > renderExpirationTime
-    ) {
-      return bailoutOnLowPriority(current, workInProgress);
-    }
-
-    // If we don't bail out, we're going be recomputing our children so we need
-    // to drop our effect list.
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
-
-    // Unmount the current children as if the component rendered null
-    var nextChildren = null;
-    reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      nextChildren,
-      renderExpirationTime
-    );
-
-    if (workInProgress.tag === ClassComponent) {
-      var instance = workInProgress.stateNode;
-      workInProgress.memoizedProps = instance.props;
-      workInProgress.memoizedState = instance.state;
-    }
-
-    return workInProgress.child;
-  }
-
   return {
-    beginWork: beginWork,
-    beginFailedWork: beginFailedWork
+    beginWork: beginWork
   };
 };
 
-var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
+var ReactFiberCompleteWork = function(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   var createInstance = config.createInstance,
     createTextInstance = config.createTextInstance,
     appendInitialChild = config.appendInitialChild,
@@ -9511,6 +9662,9 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
   var prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -9713,14 +9867,12 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
         } else {
           var container = portalOrRoot.containerInfo;
           var newChildSet = createContainerChildSet(container);
-          if (finalizeContainerChildren(container, newChildSet)) {
-            markUpdate(workInProgress);
-          }
-          portalOrRoot.pendingChildren = newChildSet;
           // If children might have changed, we have to add them all to the set.
           appendAllChildrenToContainer(newChildSet, workInProgress);
+          portalOrRoot.pendingChildren = newChildSet;
           // Schedule an update on the container to swap out the container.
           markUpdate(workInProgress);
+          finalizeContainerChildren(container, newChildSet);
         }
       };
       updateHostComponent = function(
@@ -9828,18 +9980,31 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
         return null;
       case ClassComponent: {
         // We are leaving this subtree, so pop context if any.
-        popContextProvider(workInProgress);
+        popLegacyContextProvider(workInProgress);
+
+        // If this component caught an error, schedule an error log effect.
+        var instance = workInProgress.stateNode;
+        var updateQueue = workInProgress.updateQueue;
+        if (updateQueue !== null && updateQueue.capturedValues !== null) {
+          workInProgress.effectTag &= ~DidCapture;
+          if (typeof instance.componentDidCatch === "function") {
+            workInProgress.effectTag |= ErrLog;
+          } else {
+            // Normally we clear this in the commit phase, but since we did not
+            // schedule an effect, we need to reset it here.
+            updateQueue.capturedValues = null;
+          }
+        }
         return null;
       }
       case HostRoot: {
         popHostContainer(workInProgress);
-        popTopLevelContextObject(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
         var fiberRoot = workInProgress.stateNode;
         if (fiberRoot.pendingContext) {
           fiberRoot.context = fiberRoot.pendingContext;
           fiberRoot.pendingContext = null;
         }
-
         if (current === null || current.child === null) {
           // If we hydrated, pop so that we can delete any remaining children
           // that weren't hydrated.
@@ -9849,6 +10014,11 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
           workInProgress.effectTag &= ~Placement;
         }
         updateHostContainer(workInProgress);
+
+        var _updateQueue = workInProgress.updateQueue;
+        if (_updateQueue !== null && _updateQueue.capturedValues !== null) {
+          workInProgress.effectTag |= ErrLog;
+        }
         return null;
       }
       case HostComponent: {
@@ -9863,10 +10033,13 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
           // have newProps so we'll have to reuse them.
           // TODO: Split the update API as separate for the props vs. children.
           // Even better would be if children weren't special cased at all tho.
-          var instance = workInProgress.stateNode;
+          var _instance = workInProgress.stateNode;
           var currentHostContext = getHostContext();
+          // TODO: Experiencing an error where oldProps is null. Suggests a host
+          // component is hitting the resume path. Figure out why. Possibly
+          // related to `hidden`.
           var updatePayload = prepareUpdate(
-            instance,
+            _instance,
             type,
             oldProps,
             newProps,
@@ -9920,7 +10093,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
               markUpdate(workInProgress);
             }
           } else {
-            var _instance = createInstance(
+            var _instance2 = createInstance(
               type,
               newProps,
               rootContainerInstance,
@@ -9928,14 +10101,14 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
               workInProgress
             );
 
-            appendAllChildren(_instance, workInProgress);
+            appendAllChildren(_instance2, workInProgress);
 
             // Certain renderers require commit-time effects for initial mount.
             // (eg DOM renderer supports auto-focus for certain elements).
             // Make sure such renderers get scheduled for later work.
             if (
               finalizeInitialChildren(
-                _instance,
+                _instance2,
                 type,
                 newProps,
                 rootContainerInstance,
@@ -9944,7 +10117,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
             ) {
               markUpdate(workInProgress);
             }
-            workInProgress.stateNode = _instance;
+            workInProgress.stateNode = _instance2;
           }
 
           if (workInProgress.ref !== null) {
@@ -10002,6 +10175,8 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       case ReturnComponent:
         // Does nothing.
         return null;
+      case ForwardRef:
+        return null;
       case Fragment:
         return null;
       case Mode:
@@ -10032,18 +10207,310 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
             "React. Please file an issue."
         );
     }
-  }
+  }
+
+  return {
+    completeWork: completeWork
+  };
+};
+
+function createCapturedValue(value, source) {
+  // If the value is an error, call this function immediately after it is thrown
+  // so the stack is accurate.
+  return {
+    value: value,
+    source: source,
+    stack: getStackAddendumByWorkInProgressFiber(source)
+  };
+}
+
+var ReactFiberUnwindWork = function(
+  hostContext,
+  legacyContext,
+  newContext,
+  scheduleWork,
+  isAlreadyFailedLegacyErrorBoundary
+) {
+  var popHostContainer = hostContext.popHostContainer,
+    popHostContext = hostContext.popHostContext;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
+
+  function throwException(returnFiber, sourceFiber, rawValue) {
+    // The source fiber did not complete.
+    sourceFiber.effectTag |= Incomplete;
+    // Its effect list is no longer valid.
+    sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+
+    var value = createCapturedValue(rawValue, sourceFiber);
+
+    var workInProgress = returnFiber;
+    do {
+      switch (workInProgress.tag) {
+        case HostRoot: {
+          // Uncaught error
+          var errorInfo = value;
+          ensureUpdateQueues(workInProgress);
+          var updateQueue = workInProgress.updateQueue;
+          updateQueue.capturedValues = [errorInfo];
+          workInProgress.effectTag |= ShouldCapture;
+          return;
+        }
+        case ClassComponent:
+          // Capture and retry
+          var ctor = workInProgress.type;
+          var _instance = workInProgress.stateNode;
+          if (
+            (workInProgress.effectTag & DidCapture) === NoEffect &&
+            ((typeof ctor.getDerivedStateFromCatch === "function" &&
+              enableGetDerivedStateFromCatch) ||
+              (_instance !== null &&
+                typeof _instance.componentDidCatch === "function" &&
+                !isAlreadyFailedLegacyErrorBoundary(_instance)))
+          ) {
+            ensureUpdateQueues(workInProgress);
+            var _updateQueue = workInProgress.updateQueue;
+            var capturedValues = _updateQueue.capturedValues;
+            if (capturedValues === null) {
+              _updateQueue.capturedValues = [value];
+            } else {
+              capturedValues.push(value);
+            }
+            workInProgress.effectTag |= ShouldCapture;
+            return;
+          }
+          break;
+        default:
+          break;
+      }
+      workInProgress = workInProgress["return"];
+    } while (workInProgress !== null);
+  }
+
+  function unwindWork(workInProgress) {
+    switch (workInProgress.tag) {
+      case ClassComponent: {
+        popLegacyContextProvider(workInProgress);
+        var effectTag = workInProgress.effectTag;
+        if (effectTag & ShouldCapture) {
+          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
+      }
+      case HostRoot: {
+        popHostContainer(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
+        var _effectTag = workInProgress.effectTag;
+        if (_effectTag & ShouldCapture) {
+          workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
+      }
+      case HostComponent: {
+        popHostContext(workInProgress);
+        return null;
+      }
+      case HostPortal:
+        popHostContainer(workInProgress);
+        return null;
+      case ContextProvider:
+        popProvider(workInProgress);
+        return null;
+      default:
+        return null;
+    }
+  }
+
+  function unwindInterruptedWork(interruptedWork) {
+    switch (interruptedWork.tag) {
+      case ClassComponent: {
+        popLegacyContextProvider(interruptedWork);
+        break;
+      }
+      case HostRoot: {
+        popHostContainer(interruptedWork);
+        popTopLevelLegacyContextObject(interruptedWork);
+        break;
+      }
+      case HostComponent: {
+        popHostContext(interruptedWork);
+        break;
+      }
+      case HostPortal:
+        popHostContainer(interruptedWork);
+        break;
+      case ContextProvider:
+        popProvider(interruptedWork);
+        break;
+      default:
+        break;
+    }
+  }
+
+  return {
+    throwException: throwException,
+    unwindWork: unwindWork,
+    unwindInterruptedWork: unwindInterruptedWork
+  };
+};
+
+// Module provided by RN:
+/**
+ * Intercept lifecycle errors and ensure they are shown with the correct stack
+ * trace within the native redbox component.
+ */
+function showErrorDialog(capturedError) {
+  var componentStack = capturedError.componentStack,
+    error = capturedError.error;
+
+  var errorToHandle = void 0;
+
+  // Typically Errors are thrown but eg strings or null can be thrown as well.
+  if (error instanceof Error) {
+    var message = error.message,
+      name = error.name;
+
+    var summary = message ? name + ": " + message : name;
+
+    errorToHandle = error;
+
+    try {
+      errorToHandle.message =
+        summary + "\n\nThis error is located at:" + componentStack;
+    } catch (e) {}
+  } else if (typeof error === "string") {
+    errorToHandle = new Error(
+      error + "\n\nThis error is located at:" + componentStack
+    );
+  } else {
+    errorToHandle = new Error("Unspecified error at:" + componentStack);
+  }
+
+  ExceptionsManager.handleException(errorToHandle, false);
+
+  // Return false here to prevent ReactFiberErrorLogger default behavior of
+  // logging error details to console.error. Calls to console.error are
+  // automatically routed to the native redbox controller, which we've already
+  // done above by calling ExceptionsManager.
+  return false;
+}
+
+function logCapturedError(capturedError) {
+  var logError = showErrorDialog(capturedError);
+
+  // Allow injected showErrorDialog() to prevent default console.error logging.
+  // This enables renderers like ReactNative to better manage redbox behavior.
+  if (logError === false) {
+    return;
+  }
+
+  var error = capturedError.error;
+  var suppressLogging = error && error.suppressReactErrorLogging;
+  if (suppressLogging) {
+    return;
+  }
+
+  {
+    var componentName = capturedError.componentName,
+      componentStack = capturedError.componentStack,
+      errorBoundaryName = capturedError.errorBoundaryName,
+      errorBoundaryFound = capturedError.errorBoundaryFound,
+      willRetry = capturedError.willRetry;
+
+    var componentNameMessage = componentName
+      ? "The above error occurred in the <" + componentName + "> component:"
+      : "The above error occurred in one of your React components:";
+
+    var errorBoundaryMessage = void 0;
+    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
+    if (errorBoundaryFound && errorBoundaryName) {
+      if (willRetry) {
+        errorBoundaryMessage =
+          "React will try to recreate this component tree from scratch " +
+          ("using the error boundary you provided, " + errorBoundaryName + ".");
+      } else {
+        errorBoundaryMessage =
+          "This error was initially handled by the error boundary " +
+          errorBoundaryName +
+          ".\n" +
+          "Recreating the tree from scratch failed so React will unmount the tree.";
+      }
+    } else {
+      errorBoundaryMessage =
+        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
+        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
+    }
+    var combinedMessage =
+      "" +
+      componentNameMessage +
+      componentStack +
+      "\n\n" +
+      ("" + errorBoundaryMessage);
 
-  return {
-    completeWork: completeWork
-  };
-};
+    // In development, we provide our own message with just the component stack.
+    // We don't include the original error message and JS stack because the browser
+    // has already printed it. Even if the application swallows the error, it is still
+    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+    console.error(combinedMessage);
+  }
+}
 
 var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
 var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
 
-var ReactFiberCommitWork = function(config, captureError) {
+var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+{
+  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
+}
+
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source;
+  var stack = errorInfo.stack;
+  if (stack === null) {
+    stack = getStackAddendumByWorkInProgressFiber(source);
+  }
+
+  var capturedError = {
+    componentName: source !== null ? getComponentName(source) : null,
+    componentStack: stack !== null ? stack : "",
+    error: errorInfo.value,
+    errorBoundary: null,
+    errorBoundaryName: null,
+    errorBoundaryFound: false,
+    willRetry: false
+  };
+
+  if (boundary !== null && boundary.tag === ClassComponent) {
+    capturedError.errorBoundary = boundary.stateNode;
+    capturedError.errorBoundaryName = getComponentName(boundary);
+    capturedError.errorBoundaryFound = true;
+    capturedError.willRetry = true;
+  }
+
+  try {
+    logCapturedError(capturedError);
+  } catch (e) {
+    // Prevent cycle if logCapturedError() throws.
+    // A cycle may still occur if logCapturedError renders a component that throws.
+    var suppressLogging = e && e.suppressReactErrorLogging;
+    if (!suppressLogging) {
+      console.error(e);
+    }
+  }
+}
+
+var ReactFiberCommitWork = function(
+  config,
+  captureError,
+  scheduleWork,
+  computeExpirationForFiber,
+  markLegacyErrorBoundaryAsFailed,
+  recalculateCurrentTime
+) {
   var getPublicInstance = config.getPublicInstance,
     mutation = config.mutation,
     persistence = config.persistence;
@@ -10085,58 +10552,120 @@ var ReactFiberCommitWork = function(config, captureError) {
           }
         }
       } else {
-        ref.value = null;
+        ref.current = null;
+      }
+    }
+  }
+
+  function commitBeforeMutationLifeCycles(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        if (finishedWork.effectTag & Snapshot) {
+          if (current !== null) {
+            var prevProps = current.memoizedProps;
+            var prevState = current.memoizedState;
+            startPhaseTimer(finishedWork, "getSnapshotBeforeUpdate");
+            var _instance = finishedWork.stateNode;
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            var snapshot = _instance.getSnapshotBeforeUpdate(
+              prevProps,
+              prevState
+            );
+            {
+              var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
+              if (
+                snapshot === undefined &&
+                !didWarnSet.has(finishedWork.type)
+              ) {
+                didWarnSet.add(finishedWork.type);
+                warning(
+                  false,
+                  "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
+                    "must be returned. You have returned undefined.",
+                  getComponentName(finishedWork)
+                );
+              }
+            }
+            _instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+            stopPhaseTimer();
+          }
+        }
+        return;
+      }
+      case HostRoot:
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+        // Nothing to do for these component types
+        return;
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
       }
     }
   }
 
-  function commitLifeCycles(current, finishedWork) {
+  function commitLifeCycles(
+    finishedRoot,
+    current,
+    finishedWork,
+    currentTime,
+    committedExpirationTime
+  ) {
     switch (finishedWork.tag) {
       case ClassComponent: {
-        var instance = finishedWork.stateNode;
+        var _instance2 = finishedWork.stateNode;
         if (finishedWork.effectTag & Update) {
           if (current === null) {
             startPhaseTimer(finishedWork, "componentDidMount");
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidMount();
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidMount();
             stopPhaseTimer();
           } else {
             var prevProps = current.memoizedProps;
             var prevState = current.memoizedState;
             startPhaseTimer(finishedWork, "componentDidUpdate");
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidUpdate(prevProps, prevState);
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidUpdate(
+              prevProps,
+              prevState,
+              _instance2.__reactInternalSnapshotBeforeUpdate
+            );
             stopPhaseTimer();
           }
         }
         var updateQueue = finishedWork.updateQueue;
         if (updateQueue !== null) {
-          commitCallbacks(updateQueue, instance);
+          commitCallbacks(updateQueue, _instance2);
         }
         return;
       }
       case HostRoot: {
         var _updateQueue = finishedWork.updateQueue;
         if (_updateQueue !== null) {
-          var _instance = null;
+          var _instance3 = null;
           if (finishedWork.child !== null) {
             switch (finishedWork.child.tag) {
               case HostComponent:
-                _instance = getPublicInstance(finishedWork.child.stateNode);
+                _instance3 = getPublicInstance(finishedWork.child.stateNode);
                 break;
               case ClassComponent:
-                _instance = finishedWork.child.stateNode;
+                _instance3 = finishedWork.child.stateNode;
                 break;
             }
           }
-          commitCallbacks(_updateQueue, _instance);
+          commitCallbacks(_updateQueue, _instance3);
         }
         return;
       }
       case HostComponent: {
-        var _instance2 = finishedWork.stateNode;
+        var _instance4 = finishedWork.stateNode;
 
         // Renderers may schedule work to be done after host components are mounted
         // (eg DOM renderer may schedule auto-focus for inputs and form controls).
@@ -10145,7 +10674,7 @@ var ReactFiberCommitWork = function(config, captureError) {
         if (current === null && finishedWork.effectTag & Update) {
           var type = finishedWork.type;
           var props = finishedWork.memoizedProps;
-          commitMount(_instance2, type, props, finishedWork);
+          commitMount(_instance4, type, props, finishedWork);
         }
 
         return;
@@ -10168,22 +10697,98 @@ var ReactFiberCommitWork = function(config, captureError) {
     }
   }
 
+  function commitErrorLogging(finishedWork, onUncaughtError) {
+    switch (finishedWork.tag) {
+      case ClassComponent:
+        {
+          var ctor = finishedWork.type;
+          var _instance5 = finishedWork.stateNode;
+          var updateQueue = finishedWork.updateQueue;
+          invariant(
+            updateQueue !== null && updateQueue.capturedValues !== null,
+            "An error logging effect should not have been scheduled if no errors " +
+              "were captured. This error is likely caused by a bug in React. " +
+              "Please file an issue."
+          );
+          var capturedErrors = updateQueue.capturedValues;
+          updateQueue.capturedValues = null;
+
+          if (typeof ctor.getDerivedStateFromCatch !== "function") {
+            // To preserve the preexisting retry behavior of error boundaries,
+            // we keep track of which ones already failed during this batch.
+            // This gets reset before we yield back to the browser.
+            // TODO: Warn in strict mode if getDerivedStateFromCatch is
+            // not defined.
+            markLegacyErrorBoundaryAsFailed(_instance5);
+          }
+
+          _instance5.props = finishedWork.memoizedProps;
+          _instance5.state = finishedWork.memoizedState;
+          for (var i = 0; i < capturedErrors.length; i++) {
+            var errorInfo = capturedErrors[i];
+            var _error = errorInfo.value;
+            var stack = errorInfo.stack;
+            logError(finishedWork, errorInfo);
+            _instance5.componentDidCatch(_error, {
+              componentStack: stack !== null ? stack : ""
+            });
+          }
+        }
+        break;
+      case HostRoot: {
+        var _updateQueue2 = finishedWork.updateQueue;
+        invariant(
+          _updateQueue2 !== null && _updateQueue2.capturedValues !== null,
+          "An error logging effect should not have been scheduled if no errors " +
+            "were captured. This error is likely caused by a bug in React. " +
+            "Please file an issue."
+        );
+        var _capturedErrors = _updateQueue2.capturedValues;
+        _updateQueue2.capturedValues = null;
+        for (var _i = 0; _i < _capturedErrors.length; _i++) {
+          var _errorInfo = _capturedErrors[_i];
+          logError(finishedWork, _errorInfo);
+          onUncaughtError(_errorInfo.value);
+        }
+        break;
+      }
+      default:
+        invariant(
+          false,
+          "This unit of work tag cannot capture errors.  This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+    }
+  }
+
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (ref !== null) {
-      var instance = finishedWork.stateNode;
+      var _instance6 = finishedWork.stateNode;
       var instanceToUse = void 0;
       switch (finishedWork.tag) {
         case HostComponent:
-          instanceToUse = getPublicInstance(instance);
+          instanceToUse = getPublicInstance(_instance6);
           break;
         default:
-          instanceToUse = instance;
+          instanceToUse = _instance6;
       }
       if (typeof ref === "function") {
         ref(instanceToUse);
       } else {
-        ref.value = instanceToUse;
+        {
+          if (!ref.hasOwnProperty("current")) {
+            warning(
+              false,
+              "Unexpected ref object provided for %s. " +
+                "Use either a ref-setter function or React.createRef().%s",
+              getComponentName(finishedWork),
+              getStackAddendumByWorkInProgressFiber(finishedWork)
+            );
+          }
+        }
+
+        ref.current = instanceToUse;
       }
     }
   }
@@ -10194,7 +10799,7 @@ var ReactFiberCommitWork = function(config, captureError) {
       if (typeof currentRef === "function") {
         currentRef(null);
       } else {
-        currentRef.value = null;
+        currentRef.current = null;
       }
     }
   }
@@ -10210,9 +10815,9 @@ var ReactFiberCommitWork = function(config, captureError) {
     switch (current.tag) {
       case ClassComponent: {
         safelyDetachRef(current);
-        var instance = current.stateNode;
-        if (typeof instance.componentWillUnmount === "function") {
-          safelyCallComponentWillUnmount(current, instance);
+        var _instance7 = current.stateNode;
+        if (typeof _instance7.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(current, _instance7);
         }
         return;
       }
@@ -10349,6 +10954,8 @@ var ReactFiberCommitWork = function(config, captureError) {
         },
 
         commitLifeCycles: commitLifeCycles,
+        commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
+        commitErrorLogging: commitErrorLogging,
         commitAttachRef: commitAttachRef,
         commitDetachRef: commitDetachRef
       };
@@ -10606,8 +11213,8 @@ var ReactFiberCommitWork = function(config, captureError) {
         return;
       }
       case HostComponent: {
-        var instance = finishedWork.stateNode;
-        if (instance != null) {
+        var _instance8 = finishedWork.stateNode;
+        if (_instance8 != null) {
           // Commit the work prepared earlier.
           var newProps = finishedWork.memoizedProps;
           // For hydration we reuse the update path but we treat the oldProps
@@ -10620,7 +11227,7 @@ var ReactFiberCommitWork = function(config, captureError) {
           finishedWork.updateQueue = null;
           if (updatePayload !== null) {
             commitUpdate(
-              instance,
+              _instance8,
               updatePayload,
               type,
               oldProps,
@@ -10665,11 +11272,13 @@ var ReactFiberCommitWork = function(config, captureError) {
 
   if (enableMutatingReconciler) {
     return {
+      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
       commitResetTextContent: commitResetTextContent,
       commitPlacement: commitPlacement,
       commitDeletion: commitDeletion,
       commitWork: commitWork,
       commitLifeCycles: commitLifeCycles,
+      commitErrorLogging: commitErrorLogging,
       commitAttachRef: commitAttachRef,
       commitDetachRef: commitDetachRef
     };
@@ -10680,9 +11289,12 @@ var ReactFiberCommitWork = function(config, captureError) {
 
 var NO_CONTEXT = {};
 
-var ReactFiberHostContext = function(config) {
+var ReactFiberHostContext = function(config, stack) {
   var getChildHostContext = config.getChildHostContext,
     getRootHostContext = config.getRootHostContext;
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
 
   var contextStackCursor = createCursor(NO_CONTEXT);
   var contextFiberStackCursor = createCursor(NO_CONTEXT);
@@ -10706,12 +11318,19 @@ var ReactFiberHostContext = function(config) {
     // Push current root instance onto the stack;
     // This allows us to reset root when portals are popped.
     push(rootInstanceStackCursor, nextRootInstance, fiber);
-
-    var nextRootContext = getRootHostContext(nextRootInstance);
-
     // Track the context and the Fiber that provided it.
     // This enables us to pop only Fibers that provide unique contexts.
     push(contextFiberStackCursor, fiber, fiber);
+
+    // Finally, we need to push the host context to the stack.
+    // However, we can't just call getRootHostContext() and push it because
+    // we'd have a different number of entries on the stack depending on
+    // whether getRootHostContext() throws somewhere in renderer code or not.
+    // So we push an empty value first. This lets us safely unwind on errors.
+    push(contextStackCursor, NO_CONTEXT, fiber);
+    var nextRootContext = getRootHostContext(nextRootInstance);
+    // Now that we know this function doesn't throw, replace it.
+    pop(contextStackCursor, fiber);
     push(contextStackCursor, nextRootContext, fiber);
   }
 
@@ -10753,19 +11372,13 @@ var ReactFiberHostContext = function(config) {
     pop(contextFiberStackCursor, fiber);
   }
 
-  function resetHostContainer() {
-    contextStackCursor.current = NO_CONTEXT;
-    rootInstanceStackCursor.current = NO_CONTEXT;
-  }
-
   return {
     getHostContext: getHostContext,
     getRootHostContainer: getRootHostContainer,
     popHostContainer: popHostContainer,
     popHostContext: popHostContext,
     pushHostContainer: pushHostContainer,
-    pushHostContext: pushHostContext,
-    resetHostContainer: resetHostContainer
+    pushHostContext: pushHostContext
   };
 };
 
@@ -11101,140 +11714,462 @@ var ReactFiberHydrationContext = function(config) {
         nextInstance = getNextHydratableSibling(nextInstance);
       }
     }
-
-    popToNextHostParent(fiber);
-    nextHydratableInstance = hydrationParentFiber
-      ? getNextHydratableSibling(fiber.stateNode)
-      : null;
-    return true;
+
+    popToNextHostParent(fiber);
+    nextHydratableInstance = hydrationParentFiber
+      ? getNextHydratableSibling(fiber.stateNode)
+      : null;
+    return true;
+  }
+
+  function resetHydrationState() {
+    hydrationParentFiber = null;
+    nextHydratableInstance = null;
+    isHydrating = false;
+  }
+
+  return {
+    enterHydrationState: enterHydrationState,
+    resetHydrationState: resetHydrationState,
+    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
+    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
+    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
+    popHydrationState: popHydrationState
+  };
+};
+
+// This lets us hook into Fiber to debug what it's doing.
+// See https://github.com/facebook/react/pull/8033.
+// This is not part of the public API, not even for React DevTools.
+// You may only inject a debugTool if you work on React Fiber itself.
+var ReactFiberInstrumentation = {
+  debugTool: null
+};
+
+var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
+
+var warnedAboutMissingGetChildContext = void 0;
+
+{
+  warnedAboutMissingGetChildContext = {};
+}
+
+var ReactFiberLegacyContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  // A cursor to the current merged context object on the stack.
+
+  var contextStackCursor = createCursor(emptyObject);
+  // A cursor to a boolean indicating whether the context has changed.
+  var didPerformWorkStackCursor = createCursor(false);
+  // Keep track of the previous context object that was on the stack.
+  // We use this to get access to the parent context after we have already
+  // pushed the next context provider, and now need to merge their contexts.
+  var previousContext = emptyObject;
+
+  function getUnmaskedContext(workInProgress) {
+    var hasOwnContext = isContextProvider(workInProgress);
+    if (hasOwnContext) {
+      // If the fiber is a context provider itself, when we read its context
+      // we have already pushed its own child context on the stack. A context
+      // provider should not "see" its own child context. Therefore we read the
+      // previous (parent) context instead for a context provider.
+      return previousContext;
+    }
+    return contextStackCursor.current;
+  }
+
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    var instance = workInProgress.stateNode;
+    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
+
+  function getMaskedContext(workInProgress, unmaskedContext) {
+    var type = workInProgress.type;
+    var contextTypes = type.contextTypes;
+    if (!contextTypes) {
+      return emptyObject;
+    }
+
+    // Avoid recreating masked context unless unmasked context has changed.
+    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+    // This may trigger infinite loops if componentWillReceiveProps calls setState.
+    var instance = workInProgress.stateNode;
+    if (
+      instance &&
+      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+    ) {
+      return instance.__reactInternalMemoizedMaskedChildContext;
+    }
+
+    var context = {};
+    for (var key in contextTypes) {
+      context[key] = unmaskedContext[key];
+    }
+
+    {
+      var name = getComponentName(workInProgress) || "Unknown";
+      checkPropTypes(
+        contextTypes,
+        context,
+        "context",
+        name,
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // Context is created before the class component is instantiated so check for instance.
+    if (instance) {
+      cacheContext(workInProgress, unmaskedContext, context);
+    }
+
+    return context;
+  }
+
+  function hasContextChanged() {
+    return didPerformWorkStackCursor.current;
+  }
+
+  function isContextConsumer(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
+  }
+
+  function isContextProvider(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+  }
+
+  function popContextProvider(fiber) {
+    if (!isContextProvider(fiber)) {
+      return;
+    }
+
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+
+  function popTopLevelContextObject(fiber) {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+
+  function pushTopLevelContextObject(fiber, context, didChange) {
+    invariant(
+      contextStackCursor.cursor == null,
+      "Unexpected context found on stack. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    push(contextStackCursor, context, fiber);
+    push(didPerformWorkStackCursor, didChange, fiber);
+  }
+
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode;
+    var childContextTypes = fiber.type.childContextTypes;
+
+    // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+    if (typeof instance.getChildContext !== "function") {
+      {
+        var componentName = getComponentName(fiber) || "Unknown";
+
+        if (!warnedAboutMissingGetChildContext[componentName]) {
+          warnedAboutMissingGetChildContext[componentName] = true;
+          warning(
+            false,
+            "%s.childContextTypes is specified but there is no getChildContext() method " +
+              "on the instance. You can either define getChildContext() on %s or remove " +
+              "childContextTypes from it.",
+            componentName,
+            componentName
+          );
+        }
+      }
+      return parentContext;
+    }
+
+    var childContext = void 0;
+    {
+      ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
+    }
+    startPhaseTimer(fiber, "getChildContext");
+    childContext = instance.getChildContext();
+    stopPhaseTimer();
+    {
+      ReactDebugCurrentFiber.setCurrentPhase(null);
+    }
+    for (var contextKey in childContext) {
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    }
+    {
+      var name = getComponentName(fiber) || "Unknown";
+      checkPropTypes(
+        childContextTypes,
+        childContext,
+        "child context",
+        name,
+        // In practice, there is one case in which we won't get a stack. It's when
+        // somebody calls unstable_renderSubtreeIntoContainer() and we process
+        // context from the parent component instance. The stack will be missing
+        // because it's outside of the reconciliation, and so the pointer has not
+        // been set. This is rare and doesn't matter. We'll also remove that API.
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    return Object.assign({}, parentContext, childContext);
+  }
+
+  function pushContextProvider(workInProgress) {
+    if (!isContextProvider(workInProgress)) {
+      return false;
+    }
+
+    var instance = workInProgress.stateNode;
+    // We push the context as early as possible to ensure stack integrity.
+    // If the instance does not exist yet, we will push null at first,
+    // and replace it on the stack later when invalidating the context.
+    var memoizedMergedChildContext =
+      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+      emptyObject;
+
+    // Remember the parent context so we can merge with it later.
+    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+    previousContext = contextStackCursor.current;
+    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+    push(
+      didPerformWorkStackCursor,
+      didPerformWorkStackCursor.current,
+      workInProgress
+    );
+
+    return true;
+  }
+
+  function invalidateContextProvider(workInProgress, didChange) {
+    var instance = workInProgress.stateNode;
+    invariant(
+      instance,
+      "Expected to have an instance by this point. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    if (didChange) {
+      // Merge parent and own context.
+      // Skip this if we're not updating due to sCU.
+      // This avoids unnecessarily recomputing memoized values.
+      var mergedContext = processChildContext(workInProgress, previousContext);
+      instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+
+      // Replace the old (or empty) context with the new one.
+      // It is important to unwind the context in the reverse order.
+      pop(didPerformWorkStackCursor, workInProgress);
+      pop(contextStackCursor, workInProgress);
+      // Now push the new context and mark that it has changed.
+      push(contextStackCursor, mergedContext, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    } else {
+      pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    }
   }
 
-  function resetHydrationState() {
-    hydrationParentFiber = null;
-    nextHydratableInstance = null;
-    isHydrating = false;
+  function findCurrentUnmaskedContext(fiber) {
+    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+    // makes sense elsewhere
+    invariant(
+      isFiberMounted(fiber) && fiber.tag === ClassComponent,
+      "Expected subtree parent to be a mounted class component. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    var node = fiber;
+    while (node.tag !== HostRoot) {
+      if (isContextProvider(node)) {
+        return node.stateNode.__reactInternalMemoizedMergedChildContext;
+      }
+      var parent = node["return"];
+      invariant(
+        parent,
+        "Found unexpected detached subtree parent. " +
+          "This error is likely caused by a bug in React. Please file an issue."
+      );
+      node = parent;
+    }
+    return node.stateNode.context;
   }
 
   return {
-    enterHydrationState: enterHydrationState,
-    resetHydrationState: resetHydrationState,
-    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
-    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
-    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
-    popHydrationState: popHydrationState
+    getUnmaskedContext: getUnmaskedContext,
+    cacheContext: cacheContext,
+    getMaskedContext: getMaskedContext,
+    hasContextChanged: hasContextChanged,
+    isContextConsumer: isContextConsumer,
+    isContextProvider: isContextProvider,
+    popContextProvider: popContextProvider,
+    popTopLevelContextObject: popTopLevelContextObject,
+    pushTopLevelContextObject: pushTopLevelContextObject,
+    processChildContext: processChildContext,
+    pushContextProvider: pushContextProvider,
+    invalidateContextProvider: invalidateContextProvider,
+    findCurrentUnmaskedContext: findCurrentUnmaskedContext
   };
 };
 
-// This lets us hook into Fiber to debug what it's doing.
-// See https://github.com/facebook/react/pull/8033.
-// This is not part of the public API, not even for React DevTools.
-// You may only inject a debugTool if you work on React Fiber itself.
-var ReactFiberInstrumentation = {
-  debugTool: null
-};
+var ReactFiberNewContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
 
-var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
+  var providerCursor = createCursor(null);
+  var valueCursor = createCursor(null);
+  var changedBitsCursor = createCursor(0);
 
-// Module provided by RN:
-/**
- * Intercept lifecycle errors and ensure they are shown with the correct stack
- * trace within the native redbox component.
- */
-function showErrorDialog(capturedError) {
-  var componentStack = capturedError.componentStack,
-    error = capturedError.error;
+  var rendererSigil = void 0;
+  {
+    // Use this to detect multiple renderers using the same context
+    rendererSigil = {};
+  }
 
-  var errorToHandle = void 0;
+  function pushProvider(providerFiber) {
+    var context = providerFiber.type._context;
 
-  // Typically Errors are thrown but eg strings or null can be thrown as well.
-  if (error instanceof Error) {
-    var message = error.message,
-      name = error.name;
+    push(changedBitsCursor, context._changedBits, providerFiber);
+    push(valueCursor, context._currentValue, providerFiber);
+    push(providerCursor, providerFiber, providerFiber);
 
-    var summary = message ? name + ": " + message : name;
+    context._currentValue = providerFiber.pendingProps.value;
+    context._changedBits = providerFiber.stateNode;
 
-    errorToHandle = error;
+    {
+      !(
+        context._currentRenderer === null ||
+        context._currentRenderer === rendererSigil
+      )
+        ? warning(
+            false,
+            "Detected multiple renderers concurrently rendering the " +
+              "same context provider. This is currently unsupported."
+          )
+        : void 0;
+      context._currentRenderer = rendererSigil;
+    }
+  }
 
-    try {
-      errorToHandle.message =
-        summary + "\n\nThis error is located at:" + componentStack;
-    } catch (e) {}
-  } else if (typeof error === "string") {
-    errorToHandle = new Error(
-      error + "\n\nThis error is located at:" + componentStack
-    );
-  } else {
-    errorToHandle = new Error("Unspecified error at:" + componentStack);
+  function popProvider(providerFiber) {
+    var changedBits = changedBitsCursor.current;
+    var currentValue = valueCursor.current;
+
+    pop(providerCursor, providerFiber);
+    pop(valueCursor, providerFiber);
+    pop(changedBitsCursor, providerFiber);
+
+    var context = providerFiber.type._context;
+    context._currentValue = currentValue;
+    context._changedBits = changedBits;
   }
 
-  ExceptionsManager.handleException(errorToHandle, false);
+  return {
+    pushProvider: pushProvider,
+    popProvider: popProvider
+  };
+};
 
-  // Return false here to prevent ReactFiberErrorLogger default behavior of
-  // logging error details to console.error. Calls to console.error are
-  // automatically routed to the native redbox controller, which we've already
-  // done above by calling ExceptionsManager.
-  return false;
-}
+var ReactFiberStack = function() {
+  var valueStack = [];
 
-function logCapturedError(capturedError) {
-  var logError = showErrorDialog(capturedError);
+  var fiberStack = void 0;
 
-  // Allow injected showErrorDialog() to prevent default console.error logging.
-  // This enables renderers like ReactNative to better manage redbox behavior.
-  if (logError === false) {
-    return;
+  {
+    fiberStack = [];
   }
 
-  var error = capturedError.error;
-  var suppressLogging = error && error.suppressReactErrorLogging;
-  if (suppressLogging) {
-    return;
+  var index = -1;
+
+  function createCursor(defaultValue) {
+    return {
+      current: defaultValue
+    };
   }
 
-  {
-    var componentName = capturedError.componentName,
-      componentStack = capturedError.componentStack,
-      errorBoundaryName = capturedError.errorBoundaryName,
-      errorBoundaryFound = capturedError.errorBoundaryFound,
-      willRetry = capturedError.willRetry;
+  function isEmpty() {
+    return index === -1;
+  }
 
-    var componentNameMessage = componentName
-      ? "The above error occurred in the <" + componentName + "> component:"
-      : "The above error occurred in one of your React components:";
+  function pop(cursor, fiber) {
+    if (index < 0) {
+      {
+        warning(false, "Unexpected pop.");
+      }
+      return;
+    }
 
-    var errorBoundaryMessage = void 0;
-    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
-    if (errorBoundaryFound && errorBoundaryName) {
-      if (willRetry) {
-        errorBoundaryMessage =
-          "React will try to recreate this component tree from scratch " +
-          ("using the error boundary you provided, " + errorBoundaryName + ".");
-      } else {
-        errorBoundaryMessage =
-          "This error was initially handled by the error boundary " +
-          errorBoundaryName +
-          ".\n" +
-          "Recreating the tree from scratch failed so React will unmount the tree.";
+    {
+      if (fiber !== fiberStack[index]) {
+        warning(false, "Unexpected Fiber popped.");
       }
-    } else {
-      errorBoundaryMessage =
-        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
-        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
     }
-    var combinedMessage =
-      "" +
-      componentNameMessage +
-      componentStack +
-      "\n\n" +
-      ("" + errorBoundaryMessage);
 
-    // In development, we provide our own message with just the component stack.
-    // We don't include the original error message and JS stack because the browser
-    // has already printed it. Even if the application swallows the error, it is still
-    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
-    console.error(combinedMessage);
+    cursor.current = valueStack[index];
+
+    valueStack[index] = null;
+
+    {
+      fiberStack[index] = null;
+    }
+
+    index--;
   }
-}
+
+  function push(cursor, value, fiber) {
+    index++;
+
+    valueStack[index] = cursor.current;
+
+    {
+      fiberStack[index] = fiber;
+    }
+
+    cursor.current = value;
+  }
+
+  function checkThatStackIsEmpty() {
+    {
+      if (index !== -1) {
+        warning(
+          false,
+          "Expected an empty stack. Something was not reset properly."
+        );
+      }
+    }
+  }
+
+  function resetStackAfterFatalErrorInDev() {
+    {
+      index = -1;
+      valueStack.length = 0;
+      fiberStack.length = 0;
+    }
+  }
+
+  return {
+    createCursor: createCursor,
+    isEmpty: isEmpty,
+    pop: pop,
+    push: push,
+    checkThatStackIsEmpty: checkThatStackIsEmpty,
+    resetStackAfterFatalErrorInDev: resetStackAfterFatalErrorInDev
+  };
+};
 
 var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError = ReactErrorUtils.hasCaughtError;
@@ -11251,17 +12186,19 @@ var warnAboutInvalidUpdates = void 0;
   var didWarnStateUpdateForUnmountedComponent = {};
 
   warnAboutUpdateOnUnmounted = function(fiber) {
+    // We show the whole stack but dedupe on the top component's name because
+    // the problematic code almost always lies inside that component.
     var componentName = getComponentName(fiber) || "ReactClass";
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
     warning(
       false,
-      "Can only update a mounted or mounting " +
-        "component. This usually means you called setState, replaceState, " +
-        "or forceUpdate on an unmounted component. This is a no-op.\n\nPlease " +
-        "check the code for the %s component.",
-      componentName
+      "Can't call setState (or forceUpdate) on an unmounted component. This " +
+        "is a no-op, but it indicates a memory leak in your application. To " +
+        "fix, cancel all subscriptions and asynchronous tasks in the " +
+        "componentWillUnmount method.%s",
+      getStackAddendumByWorkInProgressFiber(fiber)
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
@@ -11296,35 +12233,65 @@ var warnAboutInvalidUpdates = void 0;
 }
 
 var ReactFiberScheduler = function(config) {
-  var hostContext = ReactFiberHostContext(config);
+  var stack = ReactFiberStack();
+  var hostContext = ReactFiberHostContext(config, stack);
+  var legacyContext = ReactFiberLegacyContext(stack);
+  var newContext = ReactFiberNewContext(stack);
+  var popHostContext = hostContext.popHostContext,
+    popHostContainer = hostContext.popHostContainer;
+  var popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popLegacyContextProvider = legacyContext.popContextProvider;
+  var popProvider = newContext.popProvider;
+
   var hydrationContext = ReactFiberHydrationContext(config);
-  var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext,
-    resetHostContainer = hostContext.resetHostContainer;
 
   var _ReactFiberBeginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
     ),
-    beginWork = _ReactFiberBeginWork.beginWork,
-    beginFailedWork = _ReactFiberBeginWork.beginFailedWork;
+    beginWork = _ReactFiberBeginWork.beginWork;
 
   var _ReactFiberCompleteWo = ReactFiberCompleteWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext
     ),
     completeWork = _ReactFiberCompleteWo.completeWork;
 
-  var _ReactFiberCommitWork = ReactFiberCommitWork(config, captureError),
+  var _ReactFiberUnwindWork = ReactFiberUnwindWork(
+      hostContext,
+      legacyContext,
+      newContext,
+      scheduleWork,
+      isAlreadyFailedLegacyErrorBoundary
+    ),
+    throwException = _ReactFiberUnwindWork.throwException,
+    unwindWork = _ReactFiberUnwindWork.unwindWork,
+    unwindInterruptedWork = _ReactFiberUnwindWork.unwindInterruptedWork;
+
+  var _ReactFiberCommitWork = ReactFiberCommitWork(
+      config,
+      onCommitPhaseError,
+      scheduleWork,
+      computeExpirationForFiber,
+      markLegacyErrorBoundaryAsFailed,
+      recalculateCurrentTime
+    ),
+    commitBeforeMutationLifeCycles =
+      _ReactFiberCommitWork.commitBeforeMutationLifeCycles,
     commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
     commitPlacement = _ReactFiberCommitWork.commitPlacement,
     commitDeletion = _ReactFiberCommitWork.commitDeletion,
     commitWork = _ReactFiberCommitWork.commitWork,
     commitLifeCycles = _ReactFiberCommitWork.commitLifeCycles,
+    commitErrorLogging = _ReactFiberCommitWork.commitErrorLogging,
     commitAttachRef = _ReactFiberCommitWork.commitAttachRef,
     commitDetachRef = _ReactFiberCommitWork.commitDetachRef;
 
@@ -11336,8 +12303,9 @@ var ReactFiberScheduler = function(config) {
 
   // Represents the current time in ms.
 
-  var startTime = now();
+  var originalStartTimeMs = now();
   var mostRecentCurrentTime = msToExpirationTime(0);
+  var mostRecentCurrentTimeMs = originalStartTimeMs;
 
   // Used to ensure computeUniqueAsyncExpiration is monotonically increases.
   var lastUniqueAsyncExpiration = 0;
@@ -11358,32 +12326,86 @@ var ReactFiberScheduler = function(config) {
   // The next fiber with an effect that we're currently committing.
   var nextEffect = null;
 
-  // Keep track of which fibers have captured an error that need to be handled.
-  // Work is removed from this collection after componentDidCatch is called.
-  var capturedErrors = null;
-  // Keep track of which fibers have failed during the current batch of work.
-  // This is a different set than capturedErrors, because it is not reset until
-  // the end of the batch. This is needed to propagate errors correctly if a
-  // subtree fails more than once.
-  var failedBoundaries = null;
-  // Error boundaries that captured an error during the current commit.
-  var commitPhaseBoundaries = null;
-  var firstUncaughtError = null;
-  var didFatal = false;
-
   var isCommitting = false;
-  var isUnmounting = false;
+
+  var isRootReadyForCommit = false;
+
+  var legacyErrorBoundariesThatAlreadyFailed = null;
 
   // Used for performance tracking.
   var interruptedBy = null;
 
-  function resetContextStack() {
-    // Reset the stack
-    reset();
-    // Reset the cursors
-    resetContext();
-    resetProviderStack();
-    resetHostContainer();
+  var stashedWorkInProgressProperties = void 0;
+  var replayUnitOfWork = void 0;
+  var isReplayingFailedUnitOfWork = void 0;
+  var originalReplayError = void 0;
+  var rethrowOriginalError = void 0;
+  if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+    stashedWorkInProgressProperties = null;
+    isReplayingFailedUnitOfWork = false;
+    originalReplayError = null;
+    replayUnitOfWork = function(failedUnitOfWork, error, isAsync) {
+      // Restore the original state of the work-in-progress
+      assignFiberPropertiesInDEV(
+        failedUnitOfWork,
+        stashedWorkInProgressProperties
+      );
+      switch (failedUnitOfWork.tag) {
+        case HostRoot:
+          popHostContainer(failedUnitOfWork);
+          popTopLevelLegacyContextObject(failedUnitOfWork);
+          break;
+        case HostComponent:
+          popHostContext(failedUnitOfWork);
+          break;
+        case ClassComponent:
+          popLegacyContextProvider(failedUnitOfWork);
+          break;
+        case HostPortal:
+          popHostContainer(failedUnitOfWork);
+          break;
+        case ContextProvider:
+          popProvider(failedUnitOfWork);
+          break;
+      }
+      // Replay the begin phase.
+      isReplayingFailedUnitOfWork = true;
+      originalReplayError = error;
+      invokeGuardedCallback$2(null, workLoop, null, isAsync);
+      isReplayingFailedUnitOfWork = false;
+      originalReplayError = null;
+      if (hasCaughtError()) {
+        clearCaughtError();
+      } else {
+        // If the begin phase did not fail the second time, set this pointer
+        // back to the original value.
+        nextUnitOfWork = failedUnitOfWork;
+      }
+    };
+    rethrowOriginalError = function() {
+      throw originalReplayError;
+    };
+  }
+
+  function resetStack() {
+    if (nextUnitOfWork !== null) {
+      var interruptedWork = nextUnitOfWork["return"];
+      while (interruptedWork !== null) {
+        unwindInterruptedWork(interruptedWork);
+        interruptedWork = interruptedWork["return"];
+      }
+    }
+
+    {
+      ReactStrictModeWarnings.discardPendingWarnings();
+      stack.checkThatStackIsEmpty();
+    }
+
+    nextRoot = null;
+    nextRenderExpirationTime = NoWork;
+    nextUnitOfWork = null;
+
+    isRootReadyForCommit = false;
   }
 
   function commitAllHostEffects() {
@@ -11394,6 +12416,7 @@ var ReactFiberScheduler = function(config) {
       recordEffect();
 
       var effectTag = nextEffect.effectTag;
+
       if (effectTag & ContentReset) {
         commitResetTextContent(nextEffect);
       }
@@ -11409,8 +12432,7 @@ var ReactFiberScheduler = function(config) {
       // updates, and deletions. To avoid needing to add a case for every
       // possible bitmap value, we remove the secondary effects from the
       // effect tag and switch on that value.
-      var primaryEffectTag =
-        effectTag & ~(Callback | Err | ContentReset | Ref | PerformedWork);
+      var primaryEffectTag = effectTag & (Placement | Update | Deletion);
       switch (primaryEffectTag) {
         case Placement: {
           commitPlacement(nextEffect);
@@ -11440,9 +12462,7 @@ var ReactFiberScheduler = function(config) {
           break;
         }
         case Deletion: {
-          isUnmounting = true;
           commitDeletion(nextEffect);
-          isUnmounting = false;
           break;
         }
       }
@@ -11454,7 +12474,27 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function commitAllLifeCycles() {
+  function commitBeforeMutationLifecycles() {
+    while (nextEffect !== null) {
+      var effectTag = nextEffect.effectTag;
+
+      if (effectTag & Snapshot) {
+        recordEffect();
+        var current = nextEffect.alternate;
+        commitBeforeMutationLifeCycles(current, nextEffect);
+      }
+
+      // Don't cleanup effects yet;
+      // This will be done by commitAllLifeCycles()
+      nextEffect = nextEffect.nextEffect;
+    }
+  }
+
+  function commitAllLifeCycles(
+    finishedRoot,
+    currentTime,
+    committedExpirationTime
+  ) {
     {
       ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings();
 
@@ -11462,24 +12502,28 @@ var ReactFiberScheduler = function(config) {
         ReactStrictModeWarnings.flushPendingDeprecationWarnings();
       }
     }
-
     while (nextEffect !== null) {
       var effectTag = nextEffect.effectTag;
 
       if (effectTag & (Update | Callback)) {
         recordEffect();
         var current = nextEffect.alternate;
-        commitLifeCycles(current, nextEffect);
+        commitLifeCycles(
+          finishedRoot,
+          current,
+          nextEffect,
+          currentTime,
+          committedExpirationTime
+        );
       }
 
-      if (effectTag & Ref) {
-        recordEffect();
-        commitAttachRef(nextEffect);
+      if (effectTag & ErrLog) {
+        commitErrorLogging(nextEffect, onUncaughtError);
       }
 
-      if (effectTag & Err) {
+      if (effectTag & Ref) {
         recordEffect();
-        commitErrorHandling(nextEffect);
+        commitAttachRef(nextEffect);
       }
 
       var next = nextEffect.nextEffect;
@@ -11494,11 +12538,22 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
+  function isAlreadyFailedLegacyErrorBoundary(instance) {
+    return (
+      legacyErrorBoundariesThatAlreadyFailed !== null &&
+      legacyErrorBoundariesThatAlreadyFailed.has(instance)
+    );
+  }
+
+  function markLegacyErrorBoundaryAsFailed(instance) {
+    if (legacyErrorBoundariesThatAlreadyFailed === null) {
+      legacyErrorBoundariesThatAlreadyFailed = new Set([instance]);
+    } else {
+      legacyErrorBoundariesThatAlreadyFailed.add(instance);
+    }
+  }
+
   function commitRoot(finishedWork) {
-    // We keep track of this so that captureError can collect any boundaries
-    // that capture an error during the commit phase. The reason these aren't
-    // local to this function is because errors that occur during cWU are
-    // captured elsewhere, to prevent the unmount from being interrupted.
     isWorking = true;
     isCommitting = true;
     startCommitTimer();
@@ -11510,7 +12565,15 @@ var ReactFiberScheduler = function(config) {
         "related to the return field. This error is likely caused by a bug " +
         "in React. Please file an issue."
     );
-    root.isReadyForCommit = false;
+    var committedExpirationTime = root.pendingCommitExpirationTime;
+    invariant(
+      committedExpirationTime !== NoWork,
+      "Cannot commit an incomplete root. This error is likely caused by a " +
+        "bug in React. Please file an issue."
+    );
+    root.pendingCommitExpirationTime = NoWork;
+
+    var currentTime = recalculateCurrentTime();
 
     // Reset this to null before calling lifecycles
     ReactCurrentOwner.current = null;
@@ -11527,12 +12590,40 @@ var ReactFiberScheduler = function(config) {
       } else {
         firstEffect = finishedWork;
       }
-    } else {
-      // There is no effect on the root.
-      firstEffect = finishedWork.firstEffect;
+    } else {
+      // There is no effect on the root.
+      firstEffect = finishedWork.firstEffect;
+    }
+
+    prepareForCommit(root.containerInfo);
+
+    // Invoke instances of getSnapshotBeforeUpdate before mutation.
+    nextEffect = firstEffect;
+    startCommitSnapshotEffectsTimer();
+    while (nextEffect !== null) {
+      var didError = false;
+      var error = void 0;
+      {
+        invokeGuardedCallback$2(null, commitBeforeMutationLifecycles, null);
+        if (hasCaughtError()) {
+          didError = true;
+          error = clearCaughtError();
+        }
+      }
+      if (didError) {
+        invariant(
+          nextEffect !== null,
+          "Should have next effect. This error is likely caused by a bug " +
+            "in React. Please file an issue."
+        );
+        onCommitPhaseError(nextEffect, error);
+        // Clean-up
+        if (nextEffect !== null) {
+          nextEffect = nextEffect.nextEffect;
+        }
+      }
     }
-
-    prepareForCommit(root.containerInfo);
+    stopCommitSnapshotEffectsTimer();
 
     // Commit all the side-effects within a tree. We'll do this in two passes.
     // The first pass performs all the host insertions, updates, deletions and
@@ -11540,22 +12631,22 @@ var ReactFiberScheduler = function(config) {
     nextEffect = firstEffect;
     startCommitHostEffectsTimer();
     while (nextEffect !== null) {
-      var didError = false;
+      var _didError = false;
       var _error = void 0;
       {
         invokeGuardedCallback$2(null, commitAllHostEffects, null);
         if (hasCaughtError()) {
-          didError = true;
+          _didError = true;
           _error = clearCaughtError();
         }
       }
-      if (didError) {
+      if (_didError) {
         invariant(
           nextEffect !== null,
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        captureError(nextEffect, _error);
+        onCommitPhaseError(nextEffect, _error);
         // Clean-up
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
@@ -11579,22 +12670,29 @@ var ReactFiberScheduler = function(config) {
     nextEffect = firstEffect;
     startCommitLifeCyclesTimer();
     while (nextEffect !== null) {
-      var _didError = false;
+      var _didError2 = false;
       var _error2 = void 0;
       {
-        invokeGuardedCallback$2(null, commitAllLifeCycles, null);
+        invokeGuardedCallback$2(
+          null,
+          commitAllLifeCycles,
+          null,
+          root,
+          currentTime,
+          committedExpirationTime
+        );
         if (hasCaughtError()) {
-          _didError = true;
+          _didError2 = true;
           _error2 = clearCaughtError();
         }
       }
-      if (_didError) {
+      if (_didError2) {
         invariant(
           nextEffect !== null,
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        captureError(nextEffect, _error2);
+        onCommitPhaseError(nextEffect, _error2);
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
         }
@@ -11612,26 +12710,12 @@ var ReactFiberScheduler = function(config) {
       ReactFiberInstrumentation_1.debugTool.onCommitWork(finishedWork);
     }
 
-    // If we caught any errors during this commit, schedule their boundaries
-    // to update.
-    if (commitPhaseBoundaries) {
-      commitPhaseBoundaries.forEach(scheduleErrorRecovery);
-      commitPhaseBoundaries = null;
-    }
-
-    if (firstUncaughtError !== null) {
-      var _error3 = firstUncaughtError;
-      firstUncaughtError = null;
-      onUncaughtError(_error3);
-    }
-
     var remainingTime = root.current.expirationTime;
-
     if (remainingTime === NoWork) {
-      capturedErrors = null;
-      failedBoundaries = null;
+      // If there's no remaining work, we can clear the set of already failed
+      // error boundaries.
+      legacyErrorBoundariesThatAlreadyFailed = null;
     }
-
     return remainingTime;
   }
 
@@ -11663,6 +12747,9 @@ var ReactFiberScheduler = function(config) {
   }
 
   function completeUnitOfWork(workInProgress) {
+    // Attempt to complete the current unit of work, then move to the
+    // next sibling. If there are no more siblings, return to the
+    // parent fiber.
     while (true) {
       // The current, flushed, state of this fiber is the alternate.
       // Ideally nothing should rely on this, but relying on it here
@@ -11672,80 +12759,140 @@ var ReactFiberScheduler = function(config) {
       {
         ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
       }
-      var next = completeWork(
-        current,
-        workInProgress,
-        nextRenderExpirationTime
-      );
-      {
-        ReactDebugCurrentFiber.resetCurrentFiber();
-      }
 
       var returnFiber = workInProgress["return"];
       var siblingFiber = workInProgress.sibling;
 
-      resetExpirationTime(workInProgress, nextRenderExpirationTime);
-
-      if (next !== null) {
+      if ((workInProgress.effectTag & Incomplete) === NoEffect) {
+        // This fiber completed.
+        var next = completeWork(
+          current,
+          workInProgress,
+          nextRenderExpirationTime
+        );
         stopWorkTimer(workInProgress);
+        resetExpirationTime(workInProgress, nextRenderExpirationTime);
+        {
+          ReactDebugCurrentFiber.resetCurrentFiber();
+        }
+
+        if (next !== null) {
+          stopWorkTimer(workInProgress);
+          if (true && ReactFiberInstrumentation_1.debugTool) {
+            ReactFiberInstrumentation_1.debugTool.onCompleteWork(
+              workInProgress
+            );
+          }
+          // If completing this work spawned new work, do that next. We'll come
+          // back here again.
+          return next;
+        }
+
+        if (
+          returnFiber !== null &&
+          // Do not append effects to parents if a sibling failed to complete
+          (returnFiber.effectTag & Incomplete) === NoEffect
+        ) {
+          // Append all the effects of the subtree and this fiber onto the effect
+          // list of the parent. The completion order of the children affects the
+          // side-effect order.
+          if (returnFiber.firstEffect === null) {
+            returnFiber.firstEffect = workInProgress.firstEffect;
+          }
+          if (workInProgress.lastEffect !== null) {
+            if (returnFiber.lastEffect !== null) {
+              returnFiber.lastEffect.nextEffect = workInProgress.firstEffect;
+            }
+            returnFiber.lastEffect = workInProgress.lastEffect;
+          }
+
+          // If this fiber had side-effects, we append it AFTER the children's
+          // side-effects. We can perform certain side-effects earlier if
+          // needed, by doing multiple passes over the effect list. We don't want
+          // to schedule our own side-effect on our own list because if end up
+          // reusing children we'll schedule this effect onto itself since we're
+          // at the end.
+          var effectTag = workInProgress.effectTag;
+          // Skip both NoWork and PerformedWork tags when creating the effect list.
+          // PerformedWork effect is read by React DevTools but shouldn't be committed.
+          if (effectTag > PerformedWork) {
+            if (returnFiber.lastEffect !== null) {
+              returnFiber.lastEffect.nextEffect = workInProgress;
+            } else {
+              returnFiber.firstEffect = workInProgress;
+            }
+            returnFiber.lastEffect = workInProgress;
+          }
+        }
+
         if (true && ReactFiberInstrumentation_1.debugTool) {
           ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
         }
-        // If completing this work spawned new work, do that next. We'll come
-        // back here again.
-        return next;
-      }
 
-      if (returnFiber !== null) {
-        // Append all the effects of the subtree and this fiber onto the effect
-        // list of the parent. The completion order of the children affects the
-        // side-effect order.
-        if (returnFiber.firstEffect === null) {
-          returnFiber.firstEffect = workInProgress.firstEffect;
+        if (siblingFiber !== null) {
+          // If there is more work to do in this returnFiber, do that next.
+          return siblingFiber;
+        } else if (returnFiber !== null) {
+          // If there's no more work in this returnFiber. Complete the returnFiber.
+          workInProgress = returnFiber;
+          continue;
+        } else {
+          // We've reached the root.
+          isRootReadyForCommit = true;
+          return null;
         }
-        if (workInProgress.lastEffect !== null) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = workInProgress.firstEffect;
-          }
-          returnFiber.lastEffect = workInProgress.lastEffect;
+      } else {
+        // This fiber did not complete because something threw. Pop values off
+        // the stack without entering the complete phase. If this is a boundary,
+        // capture values if possible.
+        var _next = unwindWork(workInProgress);
+        // Because this fiber did not complete, don't reset its expiration time.
+        if (workInProgress.effectTag & DidCapture) {
+          // Restarting an error boundary
+          stopFailedWorkTimer(workInProgress);
+        } else {
+          stopWorkTimer(workInProgress);
         }
 
-        // If this fiber had side-effects, we append it AFTER the children's
-        // side-effects. We can perform certain side-effects earlier if
-        // needed, by doing multiple passes over the effect list. We don't want
-        // to schedule our own side-effect on our own list because if end up
-        // reusing children we'll schedule this effect onto itself since we're
-        // at the end.
-        var effectTag = workInProgress.effectTag;
-        // Skip both NoWork and PerformedWork tags when creating the effect list.
-        // PerformedWork effect is read by React DevTools but shouldn't be committed.
-        if (effectTag > PerformedWork) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = workInProgress;
-          } else {
-            returnFiber.firstEffect = workInProgress;
+        {
+          ReactDebugCurrentFiber.resetCurrentFiber();
+        }
+
+        if (_next !== null) {
+          stopWorkTimer(workInProgress);
+          if (true && ReactFiberInstrumentation_1.debugTool) {
+            ReactFiberInstrumentation_1.debugTool.onCompleteWork(
+              workInProgress
+            );
           }
-          returnFiber.lastEffect = workInProgress;
+          // If completing this work spawned new work, do that next. We'll come
+          // back here again.
+          // Since we're restarting, remove anything that is not a host effect
+          // from the effect tag.
+          _next.effectTag &= HostEffectMask;
+          return _next;
         }
-      }
 
-      stopWorkTimer(workInProgress);
-      if (true && ReactFiberInstrumentation_1.debugTool) {
-        ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
-      }
+        if (returnFiber !== null) {
+          // Mark the parent fiber as incomplete and clear its effect list.
+          returnFiber.firstEffect = returnFiber.lastEffect = null;
+          returnFiber.effectTag |= Incomplete;
+        }
 
-      if (siblingFiber !== null) {
-        // If there is more work to do in this returnFiber, do that next.
-        return siblingFiber;
-      } else if (returnFiber !== null) {
-        // If there's no more work in this returnFiber. Complete the returnFiber.
-        workInProgress = returnFiber;
-        continue;
-      } else {
-        // We've reached the root.
-        var root = workInProgress.stateNode;
-        root.isReadyForCommit = true;
-        return null;
+        if (true && ReactFiberInstrumentation_1.debugTool) {
+          ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
+        }
+
+        if (siblingFiber !== null) {
+          // If there is more work to do in this returnFiber, do that next.
+          return siblingFiber;
+        } else if (returnFiber !== null) {
+          // If there's no more work in this returnFiber. Complete the returnFiber.
+          workInProgress = returnFiber;
+          continue;
+        } else {
+          return null;
+        }
       }
     }
 
@@ -11768,492 +12915,228 @@ var ReactFiberScheduler = function(config) {
       ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
     }
 
-    var next = beginWork(current, workInProgress, nextRenderExpirationTime);
-    {
-      ReactDebugCurrentFiber.resetCurrentFiber();
-    }
-    if (true && ReactFiberInstrumentation_1.debugTool) {
-      ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
-    }
-
-    if (next === null) {
-      // If this doesn't spawn new work, complete the current work.
-      next = completeUnitOfWork(workInProgress);
-    }
-
-    ReactCurrentOwner.current = null;
-
-    return next;
-  }
-
-  function performFailedUnitOfWork(workInProgress) {
-    {
-      ReactStrictModeWarnings.discardPendingWarnings();
-    }
-
-    // The current, flushed, state of this fiber is the alternate.
-    // Ideally nothing should rely on this, but relying on it here
-    // means that we don't need an additional field on the work in
-    // progress.
-    var current = workInProgress.alternate;
-
-    // See if beginning this work spawns more work.
-    startWorkTimer(workInProgress);
-    {
-      ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
-    }
-    var next = beginFailedWork(
-      current,
-      workInProgress,
-      nextRenderExpirationTime
-    );
-    {
-      ReactDebugCurrentFiber.resetCurrentFiber();
-    }
-    if (true && ReactFiberInstrumentation_1.debugTool) {
-      ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
-    }
-
-    if (next === null) {
-      // If this doesn't spawn new work, complete the current work.
-      next = completeUnitOfWork(workInProgress);
-    }
-
-    ReactCurrentOwner.current = null;
-
-    return next;
-  }
-
-  function workLoop(isAsync) {
-    if (capturedErrors !== null) {
-      // If there are unhandled errors, switch to the slow work loop.
-      // TODO: How to avoid this check in the fast path? Maybe the renderer
-      // could keep track of which roots have unhandled errors and call a
-      // forked version of renderRoot.
-      slowWorkLoopThatChecksForFailedWork(isAsync);
-      return;
-    }
-    if (!isAsync) {
-      // Flush all expired work.
-      while (nextUnitOfWork !== null) {
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-      }
-    } else {
-      // Flush asynchronous work until the deadline runs out of time.
-      while (nextUnitOfWork !== null && !shouldYield()) {
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-      }
-    }
-  }
-
-  function slowWorkLoopThatChecksForFailedWork(isAsync) {
-    if (!isAsync) {
-      // Flush all expired work.
-      while (nextUnitOfWork !== null) {
-        if (hasCapturedError(nextUnitOfWork)) {
-          // Use a forked version of performUnitOfWork
-          nextUnitOfWork = performFailedUnitOfWork(nextUnitOfWork);
-        } else {
-          nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-        }
-      }
-    } else {
-      // Flush asynchronous work until the deadline runs out of time.
-      while (nextUnitOfWork !== null && !shouldYield()) {
-        if (hasCapturedError(nextUnitOfWork)) {
-          // Use a forked version of performUnitOfWork
-          nextUnitOfWork = performFailedUnitOfWork(nextUnitOfWork);
-        } else {
-          nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-        }
-      }
-    }
-  }
-
-  function renderRootCatchBlock(root, failedWork, boundary, isAsync) {
-    // We're going to restart the error boundary that captured the error.
-    // Conceptually, we're unwinding the stack. We need to unwind the
-    // context stack, too.
-    unwindContexts(failedWork, boundary);
-
-    // Restart the error boundary using a forked version of
-    // performUnitOfWork that deletes the boundary's children. The entire
-    // failed subree will be unmounted. During the commit phase, a special
-    // lifecycle method is called on the error boundary, which triggers
-    // a re-render.
-    nextUnitOfWork = performFailedUnitOfWork(boundary);
-
-    // Continue working.
-    workLoop(isAsync);
-  }
-
-  function renderRoot(root, expirationTime, isAsync) {
-    invariant(
-      !isWorking,
-      "renderRoot was called recursively. This error is likely caused " +
-        "by a bug in React. Please file an issue."
-    );
-    isWorking = true;
-
-    // We're about to mutate the work-in-progress tree. If the root was pending
-    // commit, it no longer is: we'll need to complete it again.
-    root.isReadyForCommit = false;
-
-    // Check if we're starting from a fresh stack, or if we're resuming from
-    // previously yielded work.
-    if (
-      root !== nextRoot ||
-      expirationTime !== nextRenderExpirationTime ||
-      nextUnitOfWork === null
-    ) {
-      // Reset the stack and start working from the root.
-      resetContextStack();
-      nextRoot = root;
-      nextRenderExpirationTime = expirationTime;
-      nextUnitOfWork = createWorkInProgress(
-        nextRoot.current,
-        null,
-        expirationTime
-      );
-    }
-
-    startWorkLoopTimer(nextUnitOfWork);
-
-    var didError = false;
-    var error = null;
-    {
-      invokeGuardedCallback$2(null, workLoop, null, isAsync);
-      if (hasCaughtError()) {
-        didError = true;
-        error = clearCaughtError();
-      }
-    }
-
-    // An error was thrown during the render phase.
-    while (didError) {
-      if (didFatal) {
-        // This was a fatal error. Don't attempt to recover from it.
-        firstUncaughtError = error;
-        break;
-      }
-
-      var failedWork = nextUnitOfWork;
-      if (failedWork === null) {
-        // An error was thrown but there's no current unit of work. This can
-        // happen during the commit phase if there's a bug in the renderer.
-        didFatal = true;
-        continue;
-      }
-
-      // "Capture" the error by finding the nearest boundary. If there is no
-      // error boundary, we use the root.
-      var boundary = captureError(failedWork, error);
-      invariant(
-        boundary !== null,
-        "Should have found an error boundary. This error is likely " +
-          "caused by a bug in React. Please file an issue."
+    if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+      stashedWorkInProgressProperties = assignFiberPropertiesInDEV(
+        stashedWorkInProgressProperties,
+        workInProgress
       );
-
-      if (didFatal) {
-        // The error we just captured was a fatal error. This happens
-        // when the error propagates to the root more than once.
-        continue;
-      }
-
-      didError = false;
-      error = null;
-      {
-        invokeGuardedCallback$2(
-          null,
-          renderRootCatchBlock,
-          null,
-          root,
-          failedWork,
-          boundary,
-          isAsync
-        );
-        if (hasCaughtError()) {
-          didError = true;
-          error = clearCaughtError();
-          continue;
-        }
-      }
-      // We're finished working. Exit the error loop.
-      break;
-    }
-
-    var uncaughtError = firstUncaughtError;
-
-    // We're done performing work. Time to clean up.
-    stopWorkLoopTimer(interruptedBy);
-    interruptedBy = null;
-    isWorking = false;
-    didFatal = false;
-    firstUncaughtError = null;
-
-    if (uncaughtError !== null) {
-      onUncaughtError(uncaughtError);
-    }
-
-    return root.isReadyForCommit ? root.current.alternate : null;
-  }
-
-  // Returns the boundary that captured the error, or null if the error is ignored
-  function captureError(failedWork, error) {
-    // It is no longer valid because we exited the user code.
-    ReactCurrentOwner.current = null;
+    }
+    var next = beginWork(current, workInProgress, nextRenderExpirationTime);
     {
       ReactDebugCurrentFiber.resetCurrentFiber();
+      if (isReplayingFailedUnitOfWork) {
+        // Currently replaying a failed unit of work. This should be unreachable,
+        // because the render phase is meant to be idempotent, and it should
+        // have thrown again. Since it didn't, rethrow the original error, so
+        // React's internal stack is not misaligned.
+        rethrowOriginalError();
+      }
+    }
+    if (true && ReactFiberInstrumentation_1.debugTool) {
+      ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
     }
 
-    // Search for the nearest error boundary.
-    var boundary = null;
+    if (next === null) {
+      // If this doesn't spawn new work, complete the current work.
+      next = completeUnitOfWork(workInProgress);
+    }
 
-    // Passed to logCapturedError()
-    var errorBoundaryFound = false;
-    var willRetry = false;
-    var errorBoundaryName = null;
+    ReactCurrentOwner.current = null;
 
-    // Host containers are a special case. If the failed work itself is a host
-    // container, then it acts as its own boundary. In all other cases, we
-    // ignore the work itself and only search through the parents.
-    if (failedWork.tag === HostRoot) {
-      boundary = failedWork;
+    return next;
+  }
 
-      if (isFailedBoundary(failedWork)) {
-        // If this root already failed, there must have been an error when
-        // attempting to unmount it. This is a worst-case scenario and
-        // should only be possible if there's a bug in the renderer.
-        didFatal = true;
+  function workLoop(isAsync) {
+    if (!isAsync) {
+      // Flush all expired work.
+      while (nextUnitOfWork !== null) {
+        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
       }
     } else {
-      var node = failedWork["return"];
-      while (node !== null && boundary === null) {
-        if (node.tag === ClassComponent) {
-          var instance = node.stateNode;
-          if (typeof instance.componentDidCatch === "function") {
-            errorBoundaryFound = true;
-            errorBoundaryName = getComponentName(node);
+      // Flush asynchronous work until the deadline runs out of time.
+      while (nextUnitOfWork !== null && !shouldYield()) {
+        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+      }
+    }
+  }
 
-            // Found an error boundary!
-            boundary = node;
-            willRetry = true;
-          }
-        } else if (node.tag === HostRoot) {
-          // Treat the root like a no-op error boundary
-          boundary = node;
-        }
+  function renderRoot(root, expirationTime, isAsync) {
+    invariant(
+      !isWorking,
+      "renderRoot was called recursively. This error is likely caused " +
+        "by a bug in React. Please file an issue."
+    );
+    isWorking = true;
 
-        if (isFailedBoundary(node)) {
-          // This boundary is already in a failed state.
+    // Check if we're starting from a fresh stack, or if we're resuming from
+    // previously yielded work.
+    if (
+      expirationTime !== nextRenderExpirationTime ||
+      root !== nextRoot ||
+      nextUnitOfWork === null
+    ) {
+      // Reset the stack and start working from the root.
+      resetStack();
+      nextRoot = root;
+      nextRenderExpirationTime = expirationTime;
+      nextUnitOfWork = createWorkInProgress(
+        nextRoot.current,
+        null,
+        nextRenderExpirationTime
+      );
+      root.pendingCommitExpirationTime = NoWork;
+    }
 
-          // If we're currently unmounting, that means this error was
-          // thrown while unmounting a failed subtree. We should ignore
-          // the error.
-          if (isUnmounting) {
-            return null;
-          }
+    var didFatal = false;
 
-          // If we're in the commit phase, we should check to see if
-          // this boundary already captured an error during this commit.
-          // This case exists because multiple errors can be thrown during
-          // a single commit without interruption.
-          if (
-            commitPhaseBoundaries !== null &&
-            (commitPhaseBoundaries.has(node) ||
-              (node.alternate !== null &&
-                commitPhaseBoundaries.has(node.alternate)))
-          ) {
-            // If so, we should ignore this error.
-            return null;
-          }
+    startWorkLoopTimer(nextUnitOfWork);
 
-          // The error should propagate to the next boundary -— we keep looking.
-          boundary = null;
-          willRetry = false;
+    do {
+      try {
+        workLoop(isAsync);
+      } catch (thrownValue) {
+        if (nextUnitOfWork === null) {
+          // This is a fatal error.
+          didFatal = true;
+          onUncaughtError(thrownValue);
+          break;
         }
 
-        node = node["return"];
-      }
-    }
-
-    if (boundary !== null) {
-      // Add to the collection of failed boundaries. This lets us know that
-      // subsequent errors in this subtree should propagate to the next boundary.
-      if (failedBoundaries === null) {
-        failedBoundaries = new Set();
-      }
-      failedBoundaries.add(boundary);
-
-      // This method is unsafe outside of the begin and complete phases.
-      // We might be in the commit phase when an error is captured.
-      // The risk is that the return path from this Fiber may not be accurate.
-      // That risk is acceptable given the benefit of providing users more context.
-      var _componentStack = getStackAddendumByWorkInProgressFiber(failedWork);
-      var _componentName = getComponentName(failedWork);
+        if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+          var failedUnitOfWork = nextUnitOfWork;
+          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
+        }
 
-      // Add to the collection of captured errors. This is stored as a global
-      // map of errors and their component stack location keyed by the boundaries
-      // that capture them. We mostly use this Map as a Set; it's a Map only to
-      // avoid adding a field to Fiber to store the error.
-      if (capturedErrors === null) {
-        capturedErrors = new Map();
+        var sourceFiber = nextUnitOfWork;
+        var returnFiber = sourceFiber["return"];
+        if (returnFiber === null) {
+          // This is the root. The root could capture its own errors. However,
+          // we don't know if it errors before or after we pushed the host
+          // context. This information is needed to avoid a stack mismatch.
+          // Because we're not sure, treat this as a fatal error. We could track
+          // which phase it fails in, but doesn't seem worth it. At least
+          // for now.
+          didFatal = true;
+          onUncaughtError(thrownValue);
+          break;
+        }
+        throwException(returnFiber, sourceFiber, thrownValue);
+        nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
+      break;
+    } while (true);
 
-      var capturedError = {
-        componentName: _componentName,
-        componentStack: _componentStack,
-        error: error,
-        errorBoundary: errorBoundaryFound ? boundary.stateNode : null,
-        errorBoundaryFound: errorBoundaryFound,
-        errorBoundaryName: errorBoundaryName,
-        willRetry: willRetry
-      };
-
-      capturedErrors.set(boundary, capturedError);
+    // We're done performing work. Time to clean up.
+    var didCompleteRoot = false;
+    isWorking = false;
 
-      try {
-        logCapturedError(capturedError);
-      } catch (e) {
-        // Prevent cycle if logCapturedError() throws.
-        // A cycle may still occur if logCapturedError renders a component that throws.
-        var suppressLogging = e && e.suppressReactErrorLogging;
-        if (!suppressLogging) {
-          console.error(e);
-        }
+    // Yield back to main thread.
+    if (didFatal) {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
+      // There was a fatal error.
+      {
+        stack.resetStackAfterFatalErrorInDev();
       }
-
-      // If we're in the commit phase, defer scheduling an update on the
-      // boundary until after the commit is complete
-      if (isCommitting) {
-        if (commitPhaseBoundaries === null) {
-          commitPhaseBoundaries = new Set();
-        }
-        commitPhaseBoundaries.add(boundary);
+      return null;
+    } else if (nextUnitOfWork === null) {
+      // We reached the root.
+      if (isRootReadyForCommit) {
+        didCompleteRoot = true;
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
+        // The root successfully completed. It's ready for commit.
+        root.pendingCommitExpirationTime = expirationTime;
+        var finishedWork = root.current.alternate;
+        return finishedWork;
       } else {
-        // Otherwise, schedule an update now.
-        // TODO: Is this actually necessary during the render phase? Is it
-        // possible to unwind and continue rendering at the same priority,
-        // without corrupting internal state?
-        scheduleErrorRecovery(boundary);
+        // The root did not complete.
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
+        invariant(
+          false,
+          "Expired work should have completed. This error is likely caused " +
+            "by a bug in React. Please file an issue."
+        );
       }
-      return boundary;
-    } else if (firstUncaughtError === null) {
-      // If no boundary is found, we'll need to throw the error
-      firstUncaughtError = error;
+    } else {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
+      // There's more work to do, but we ran out of time. Yield back to
+      // the renderer.
+      return null;
     }
-    return null;
-  }
-
-  function hasCapturedError(fiber) {
-    // TODO: capturedErrors should store the boundary instance, to avoid needing
-    // to check the alternate.
-    return (
-      capturedErrors !== null &&
-      (capturedErrors.has(fiber) ||
-        (fiber.alternate !== null && capturedErrors.has(fiber.alternate)))
-    );
   }
 
-  function isFailedBoundary(fiber) {
-    // TODO: failedBoundaries should store the boundary instance, to avoid
-    // needing to check the alternate.
-    return (
-      failedBoundaries !== null &&
-      (failedBoundaries.has(fiber) ||
-        (fiber.alternate !== null && failedBoundaries.has(fiber.alternate)))
-    );
+  function scheduleCapture(sourceFiber, boundaryFiber, value, expirationTime) {
+    // TODO: We only support dispatching errors.
+    var capturedValue = createCapturedValue(value, sourceFiber);
+    var update = {
+      expirationTime: expirationTime,
+      partialState: null,
+      callback: null,
+      isReplace: false,
+      isForced: false,
+      capturedValue: capturedValue,
+      next: null
+    };
+    insertUpdateIntoFiber(boundaryFiber, update);
+    scheduleWork(boundaryFiber, expirationTime);
   }
 
-  function commitErrorHandling(effectfulFiber) {
-    var capturedError = void 0;
-    if (capturedErrors !== null) {
-      capturedError = capturedErrors.get(effectfulFiber);
-      capturedErrors["delete"](effectfulFiber);
-      if (capturedError == null) {
-        if (effectfulFiber.alternate !== null) {
-          effectfulFiber = effectfulFiber.alternate;
-          capturedError = capturedErrors.get(effectfulFiber);
-          capturedErrors["delete"](effectfulFiber);
-        }
-      }
-    }
-
+  function dispatch(sourceFiber, value, expirationTime) {
     invariant(
-      capturedError != null,
-      "No error for given unit of work. This error is likely caused by a " +
-        "bug in React. Please file an issue."
+      !isWorking || isCommitting,
+      "dispatch: Cannot dispatch during the render phase."
     );
 
-    switch (effectfulFiber.tag) {
-      case ClassComponent:
-        var instance = effectfulFiber.stateNode;
-
-        var info = {
-          componentStack: capturedError.componentStack
-        };
-
-        // Allow the boundary to handle the error, usually by scheduling
-        // an update to itself
-        instance.componentDidCatch(capturedError.error, info);
-        return;
-      case HostRoot:
-        if (firstUncaughtError === null) {
-          firstUncaughtError = capturedError.error;
-        }
-        return;
-      default:
-        invariant(
-          false,
-          "Invalid type of work. This error is likely caused by a bug in " +
-            "React. Please file an issue."
-        );
-    }
-  }
+    // TODO: Handle arrays
 
-  function unwindContexts(from, to) {
-    var node = from;
-    while (node !== null) {
-      switch (node.tag) {
+    var fiber = sourceFiber["return"];
+    while (fiber !== null) {
+      switch (fiber.tag) {
         case ClassComponent:
-          popContextProvider(node);
-          break;
-        case HostComponent:
-          popHostContext(node);
+          var ctor = fiber.type;
+          var instance = fiber.stateNode;
+          if (
+            typeof ctor.getDerivedStateFromCatch === "function" ||
+            (typeof instance.componentDidCatch === "function" &&
+              !isAlreadyFailedLegacyErrorBoundary(instance))
+          ) {
+            scheduleCapture(sourceFiber, fiber, value, expirationTime);
+            return;
+          }
           break;
+        // TODO: Handle async boundaries
         case HostRoot:
-          popHostContainer(node);
-          break;
-        case HostPortal:
-          popHostContainer(node);
-          break;
-        case ContextProvider:
-          popProvider(node);
-          break;
-      }
-      if (node === to || node.alternate === to) {
-        stopFailedWorkTimer(node);
-        break;
-      } else {
-        stopWorkTimer(node);
+          scheduleCapture(sourceFiber, fiber, value, expirationTime);
+          return;
       }
-      node = node["return"];
+      fiber = fiber["return"];
+    }
+
+    if (sourceFiber.tag === HostRoot) {
+      // Error was thrown at the root. There is no parent, so the root
+      // itself should capture it.
+      scheduleCapture(sourceFiber, sourceFiber, value, expirationTime);
     }
   }
 
-  function computeAsyncExpiration() {
+  function onCommitPhaseError(fiber, error) {
+    return dispatch(fiber, error, Sync);
+  }
+
+  function computeAsyncExpiration(currentTime) {
     // Given the current clock time, returns an expiration time. We use rounding
     // to batch like updates together.
     // Should complete within ~1000ms. 1200ms max.
-    var currentTime = recalculateCurrentTime();
-    var expirationMs = 1000;
-    var bucketSizeMs = 200;
+    var expirationMs = 5000;
+    var bucketSizeMs = 250;
     return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
   }
 
-  function computeInteractiveExpiration() {
+  function computeInteractiveExpiration(currentTime) {
     // Should complete within ~500ms. 600ms max.
-    var currentTime = recalculateCurrentTime();
     var expirationMs = 500;
     var bucketSizeMs = 100;
     return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
@@ -12261,7 +13144,8 @@ var ReactFiberScheduler = function(config) {
 
   // Creates a unique async expiration time.
   function computeUniqueAsyncExpiration() {
-    var result = computeAsyncExpiration();
+    var currentTime = recalculateCurrentTime();
+    var result = computeAsyncExpiration(currentTime);
     if (result <= lastUniqueAsyncExpiration) {
       // Since we assume the current time monotonically increases, we only hit
       // this branch when computeUniqueAsyncExpiration is fired multiple times
@@ -12293,10 +13177,12 @@ var ReactFiberScheduler = function(config) {
       if (fiber.mode & AsyncMode) {
         if (isBatchingInteractiveUpdates) {
           // This is an interactive update
-          expirationTime = computeInteractiveExpiration();
+          var currentTime = recalculateCurrentTime();
+          expirationTime = computeInteractiveExpiration(currentTime);
         } else {
           // This is an async update
-          expirationTime = computeAsyncExpiration();
+          var _currentTime = recalculateCurrentTime();
+          expirationTime = computeAsyncExpiration(_currentTime);
         }
       } else {
         // This is a sync update
@@ -12321,23 +13207,6 @@ var ReactFiberScheduler = function(config) {
     return scheduleWorkImpl(fiber, expirationTime, false);
   }
 
-  function checkRootNeedsClearing(root, fiber, expirationTime) {
-    if (
-      !isWorking &&
-      root === nextRoot &&
-      expirationTime < nextRenderExpirationTime
-    ) {
-      // Restart the root from the top.
-      if (nextUnitOfWork !== null) {
-        // This is an interruption. (Used for performance tracking.)
-        interruptedBy = fiber;
-      }
-      nextRoot = null;
-      nextUnitOfWork = null;
-      nextRenderExpirationTime = NoWork;
-    }
-  }
-
   function scheduleWorkImpl(fiber, expirationTime, isErrorRecovery) {
     recordScheduleUpdate();
 
@@ -12369,10 +13238,35 @@ var ReactFiberScheduler = function(config) {
       if (node["return"] === null) {
         if (node.tag === HostRoot) {
           var root = node.stateNode;
-
-          checkRootNeedsClearing(root, fiber, expirationTime);
-          requestWork(root, expirationTime);
-          checkRootNeedsClearing(root, fiber, expirationTime);
+          if (
+            !isWorking &&
+            nextRenderExpirationTime !== NoWork &&
+            expirationTime < nextRenderExpirationTime
+          ) {
+            // This is an interruption. (Used for performance tracking.)
+            interruptedBy = fiber;
+            resetStack();
+          }
+          if (
+            // If we're in the render phase, we don't need to schedule this root
+            // for an update, because we'll do it before we exit...
+            !isWorking ||
+            isCommitting ||
+            // ...unless this is a different root than the one we're rendering.
+            nextRoot !== root
+          ) {
+            // Add this root to the root schedule.
+            requestWork(root, expirationTime);
+          }
+          if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
+            invariant(
+              false,
+              "Maximum update depth exceeded. This can happen when a " +
+                "component repeatedly calls setState inside " +
+                "componentWillUpdate or componentDidUpdate. React limits " +
+                "the number of nested updates to prevent infinite loops."
+            );
+          }
         } else {
           {
             if (!isErrorRecovery && fiber.tag === ClassComponent) {
@@ -12386,27 +13280,23 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function scheduleErrorRecovery(fiber) {
-    scheduleWorkImpl(fiber, Sync, true);
-  }
-
   function recalculateCurrentTime() {
     // Subtract initial time so it fits inside 32bits
-    var ms = now() - startTime;
-    mostRecentCurrentTime = msToExpirationTime(ms);
+    mostRecentCurrentTimeMs = now() - originalStartTimeMs;
+    mostRecentCurrentTime = msToExpirationTime(mostRecentCurrentTimeMs);
     return mostRecentCurrentTime;
   }
 
   function deferredUpdates(fn) {
     var previousExpirationContext = expirationContext;
-    expirationContext = computeAsyncExpiration();
+    var currentTime = recalculateCurrentTime();
+    expirationContext = computeAsyncExpiration(currentTime);
     try {
       return fn();
     } finally {
       expirationContext = previousExpirationContext;
     }
   }
-
   function syncUpdates(fn, a, b, c, d) {
     var previousExpirationContext = expirationContext;
     expirationContext = Sync;
@@ -12464,7 +13354,7 @@ var ReactFiberScheduler = function(config) {
     }
 
     // Compute a timeout for the given expiration time.
-    var currentMs = now() - startTime;
+    var currentMs = now() - originalStartTimeMs;
     var expirationMs = expirationTimeToMs(expirationTime);
     var timeout = expirationMs - currentMs;
 
@@ -12477,16 +13367,35 @@ var ReactFiberScheduler = function(config) {
   // requestWork is called by the scheduler whenever a root receives an update.
   // It's up to the renderer to call renderRoot at some point in the future.
   function requestWork(root, expirationTime) {
-    if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
-      invariant(
-        false,
-        "Maximum update depth exceeded. This can happen when a " +
-          "component repeatedly calls setState inside componentWillUpdate or " +
-          "componentDidUpdate. React limits the number of nested updates to " +
-          "prevent infinite loops."
-      );
+    addRootToSchedule(root, expirationTime);
+
+    if (isRendering) {
+      // Prevent reentrancy. Remaining work will be scheduled at the end of
+      // the currently rendering batch.
+      return;
+    }
+
+    if (isBatchingUpdates) {
+      // Flush work at the end of the batch.
+      if (isUnbatchingUpdates) {
+        // ...unless we're inside unbatchedUpdates, in which case we should
+        // flush it now.
+        nextFlushedRoot = root;
+        nextFlushedExpirationTime = Sync;
+        performWorkOnRoot(root, Sync, false);
+      }
+      return;
+    }
+
+    // TODO: Get rid of Sync and use current time?
+    if (expirationTime === Sync) {
+      performSyncWork();
+    } else {
+      scheduleCallbackWithExpiration(expirationTime);
     }
+  }
 
+  function addRootToSchedule(root, expirationTime) {
     // Add the root to the schedule.
     // Check if this root is already part of the schedule.
     if (root.nextScheduledRoot === null) {
@@ -12511,37 +13420,11 @@ var ReactFiberScheduler = function(config) {
         root.remainingExpirationTime = expirationTime;
       }
     }
-
-    if (isRendering) {
-      // Prevent reentrancy. Remaining work will be scheduled at the end of
-      // the currently rendering batch.
-      return;
-    }
-
-    if (isBatchingUpdates) {
-      if (isUnbatchingUpdates) {
-        // Flush work at the end of the batch.
-        // ...unless we're inside unbatchedUpdates, in which case we should
-        // flush it now.
-        nextFlushedRoot = root;
-        nextFlushedExpirationTime = Sync;
-        performWorkOnRoot(root, Sync, false);
-      }
-      return;
-    }
-
-    // TODO: Get rid of Sync and use current time?
-    if (expirationTime === Sync) {
-      performSyncWork();
-    } else {
-      scheduleCallbackWithExpiration(expirationTime);
-    }
   }
 
   function findHighestPriorityRoot() {
     var highestPriorityWork = NoWork;
     var highestPriorityRoot = null;
-
     if (lastScheduledRoot !== null) {
       var previousScheduledRoot = lastScheduledRoot;
       var root = firstScheduledRoot;
@@ -12603,7 +13486,8 @@ var ReactFiberScheduler = function(config) {
     var previousFlushedRoot = nextFlushedRoot;
     if (
       previousFlushedRoot !== null &&
-      previousFlushedRoot === highestPriorityRoot
+      previousFlushedRoot === highestPriorityRoot &&
+      highestPriorityWork === Sync
     ) {
       nestedUpdateCount++;
     } else {
@@ -12631,7 +13515,8 @@ var ReactFiberScheduler = function(config) {
 
     if (enableUserTimingAPI && deadline !== null) {
       var didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-      stopRequestCallbackTimer(didExpire);
+      var timeout = expirationTimeToMs(nextFlushedExpirationTime);
+      stopRequestCallbackTimer(didExpire, timeout);
     }
 
     if (isAsync) {
@@ -12678,7 +13563,6 @@ var ReactFiberScheduler = function(config) {
     // Clean-up.
     deadline = null;
     deadlineDidExpire = false;
-    nestedUpdateCount = 0;
 
     finishRendering();
   }
@@ -12692,11 +13576,17 @@ var ReactFiberScheduler = function(config) {
     // Perform work on root as if the given expiration time is the current time.
     // This has the effect of synchronously flushing all work up to and
     // including the given time.
+    nextFlushedRoot = root;
+    nextFlushedExpirationTime = expirationTime;
     performWorkOnRoot(root, expirationTime, false);
+    // Flush any sync work that was scheduled by lifecycles
+    performSyncWork();
     finishRendering();
   }
 
   function finishRendering() {
+    nestedUpdateCount = 0;
+
     if (completedBatches !== null) {
       var batches = completedBatches;
       completedBatches = null;
@@ -12714,10 +13604,10 @@ var ReactFiberScheduler = function(config) {
     }
 
     if (hasUnhandledError) {
-      var _error4 = unhandledError;
+      var error = unhandledError;
       unhandledError = null;
       hasUnhandledError = false;
-      throw _error4;
+      throw error;
     }
   }
 
@@ -12810,8 +13700,6 @@ var ReactFiberScheduler = function(config) {
     return true;
   }
 
-  // TODO: Not happy about this hook. Conceptually, renderRoot should return a
-  // tuple of (isReadyForCommit, didError, error)
   function onUncaughtError(error) {
     invariant(
       nextFlushedRoot !== null,
@@ -12928,6 +13816,7 @@ var ReactFiberScheduler = function(config) {
   }
 
   return {
+    recalculateCurrentTime: recalculateCurrentTime,
     computeExpirationForFiber: computeExpirationForFiber,
     scheduleWork: scheduleWork,
     requestWork: requestWork,
@@ -12940,7 +13829,8 @@ var ReactFiberScheduler = function(config) {
     syncUpdates: syncUpdates,
     interactiveUpdates: interactiveUpdates,
     flushInteractiveUpdates: flushInteractiveUpdates,
-    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration
+    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration,
+    legacyContext: legacyContext
   };
 };
 
@@ -12953,24 +13843,13 @@ var didWarnAboutNestedUpdates = void 0;
 // 0 is PROD, 1 is DEV.
 // Might add PROFILE later.
 
-function getContextForSubtree(parentComponent) {
-  if (!parentComponent) {
-    return emptyObject;
-  }
-
-  var fiber = get(parentComponent);
-  var parentContext = findCurrentUnmaskedContext(fiber);
-  return isContextProvider(fiber)
-    ? processChildContext(fiber, parentContext)
-    : parentContext;
-}
-
 var ReactFiberReconciler$1 = function(config) {
   var getPublicInstance = config.getPublicInstance;
 
   var _ReactFiberScheduler = ReactFiberScheduler(config),
     computeUniqueAsyncExpiration =
       _ReactFiberScheduler.computeUniqueAsyncExpiration,
+    recalculateCurrentTime = _ReactFiberScheduler.recalculateCurrentTime,
     computeExpirationForFiber = _ReactFiberScheduler.computeExpirationForFiber,
     scheduleWork = _ReactFiberScheduler.scheduleWork,
     requestWork = _ReactFiberScheduler.requestWork,
@@ -12982,9 +13861,32 @@ var ReactFiberReconciler$1 = function(config) {
     deferredUpdates = _ReactFiberScheduler.deferredUpdates,
     syncUpdates = _ReactFiberScheduler.syncUpdates,
     interactiveUpdates = _ReactFiberScheduler.interactiveUpdates,
-    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates;
+    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates,
+    legacyContext = _ReactFiberScheduler.legacyContext;
+
+  var findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
+
+  function getContextForSubtree(parentComponent) {
+    if (!parentComponent) {
+      return emptyObject;
+    }
+
+    var fiber = get(parentComponent);
+    var parentContext = findCurrentUnmaskedContext(fiber);
+    return isContextProvider(fiber)
+      ? processChildContext(fiber, parentContext)
+      : parentContext;
+  }
 
-  function scheduleRootUpdate(current, element, expirationTime, callback) {
+  function scheduleRootUpdate(
+    current,
+    element,
+    currentTime,
+    expirationTime,
+    callback
+  ) {
     {
       if (
         ReactDebugCurrentFiber.phase === "render" &&
@@ -13005,12 +13907,14 @@ var ReactFiberReconciler$1 = function(config) {
 
     callback = callback === undefined ? null : callback;
     {
-      warning(
-        callback === null || typeof callback === "function",
-        "render(...): Expected the last optional `callback` argument to be a " +
-          "function. Instead received: %s.",
-        callback
-      );
+      !(callback === null || typeof callback === "function")
+        ? warning(
+            false,
+            "render(...): Expected the last optional `callback` argument to be a " +
+              "function. Instead received: %s.",
+            callback
+          )
+        : void 0;
     }
 
     var update = {
@@ -13019,6 +13923,7 @@ var ReactFiberReconciler$1 = function(config) {
       callback: callback,
       isReplace: false,
       isForced: false,
+      capturedValue: null,
       next: null
     };
     insertUpdateIntoFiber(current, update);
@@ -13031,6 +13936,7 @@ var ReactFiberReconciler$1 = function(config) {
     element,
     container,
     parentComponent,
+    currentTime,
     expirationTime,
     callback
   ) {
@@ -13056,7 +13962,13 @@ var ReactFiberReconciler$1 = function(config) {
       container.pendingContext = context;
     }
 
-    return scheduleRootUpdate(current, element, expirationTime, callback);
+    return scheduleRootUpdate(
+      current,
+      element,
+      currentTime,
+      expirationTime,
+      callback
+    );
   }
 
   function findHostInstance(fiber) {
@@ -13073,17 +13985,34 @@ var ReactFiberReconciler$1 = function(config) {
     },
     updateContainer: function(element, container, parentComponent, callback) {
       var current = container.current;
+      var currentTime = recalculateCurrentTime();
       var expirationTime = computeExpirationForFiber(current);
       return updateContainerAtExpirationTime(
         element,
         container,
         parentComponent,
+        currentTime,
+        expirationTime,
+        callback
+      );
+    },
+    updateContainerAtExpirationTime: function(
+      element,
+      container,
+      parentComponent,
+      expirationTime,
+      callback
+    ) {
+      var currentTime = recalculateCurrentTime();
+      return updateContainerAtExpirationTime(
+        element,
+        container,
+        parentComponent,
+        currentTime,
         expirationTime,
         callback
       );
     },
-
-    updateContainerAtExpirationTime: updateContainerAtExpirationTime,
 
     flushRoot: flushRoot,
 
@@ -13307,7 +14236,8 @@ var frameDeadline = 0;
 var frameDeadlineObject = {
   timeRemaining: function() {
     return frameDeadline - now();
-  }
+  },
+  didTimeout: false
 };
 
 function setTimeoutCallback() {
@@ -13828,8 +14758,7 @@ var ReactNativeRenderer = {
     NativeMethodsMixin: NativeMethodsMixin,
     // Used by react-native-github/Libraries/ components
     ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin, // requireNativeComponent
-    ReactGlobalSharedState: ReactGlobalSharedState, // Systrace
-    ReactNativeComponentTree: ReactNativeComponentTree, // InspectorUtils, ScrollResponder
+    ReactNativeComponentTree: ReactNativeComponentTree, // ScrollResponder
     ReactNativePropRegistry: ReactNativePropRegistry, // flattenStyle, Stylesheet
     TouchHistoryMath: TouchHistoryMath, // PanResponder
     createReactNativeComponentClass: createReactNativeComponentClass, // RCTText, RCTView, ReactNativeART
diff --git a/Libraries/Renderer/ReactNativeRenderer-prod.js b/Libraries/Renderer/ReactNativeRenderer-prod.js
index b62e953324916f..055ddd7bb0c161 100644
--- a/Libraries/Renderer/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/ReactNativeRenderer-prod.js
@@ -13,12 +13,12 @@
 require("InitializeCore");
 var invariant = require("fbjs/lib/invariant"),
   emptyFunction = require("fbjs/lib/emptyFunction"),
-  RCTEventEmitter = require("RCTEventEmitter"),
   UIManager = require("UIManager"),
-  React = require("react"),
+  RCTEventEmitter = require("RCTEventEmitter"),
   TextInputState = require("TextInputState"),
   deepDiffer = require("deepDiffer"),
   flattenStyle = require("flattenStyle"),
+  React = require("react"),
   emptyObject = require("fbjs/lib/emptyObject"),
   shallowEqual = require("fbjs/lib/shallowEqual"),
   ExceptionsManager = require("ExceptionsManager");
@@ -942,6 +942,7 @@ var eventTypes = {
       nativeEvent,
       nativeEventTarget
     ) {
+      if (null == targetInst) return null;
       var bubbleDispatchConfig = customBubblingEventTypes[topLevelType],
         directDispatchConfig = customDirectEventTypes[topLevelType];
       invariant(
@@ -991,26 +992,45 @@ function getInstanceFromTag(tag) {
   return "number" === typeof tag ? instanceCache[tag] || null : tag;
 }
 var ReactNativeComponentTree = Object.freeze({
-    precacheFiberNode: function(hostInst, tag) {
-      instanceCache[tag] = hostInst;
-    },
-    uncacheFiberNode: uncacheFiberNode,
-    getClosestInstanceFromNode: getInstanceFromTag,
-    getInstanceFromNode: getInstanceFromTag,
-    getNodeFromInstance: function(inst) {
-      var tag = inst.stateNode._nativeTag;
-      void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
-      invariant(tag, "All native instances should have a tag.");
-      return tag;
-    },
-    getFiberCurrentPropsFromNode: function(stateNode) {
-      return instanceProps[stateNode._nativeTag] || null;
-    },
-    updateFiberProps: function(tag, props) {
-      instanceProps[tag] = props;
-    }
-  }),
-  restoreTarget = null,
+  precacheFiberNode: function(hostInst, tag) {
+    instanceCache[tag] = hostInst;
+  },
+  uncacheFiberNode: uncacheFiberNode,
+  getClosestInstanceFromNode: getInstanceFromTag,
+  getInstanceFromNode: getInstanceFromTag,
+  getNodeFromInstance: function(inst) {
+    var tag = inst.stateNode._nativeTag;
+    void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
+    invariant(tag, "All native instances should have a tag.");
+    return tag;
+  },
+  getFiberCurrentPropsFromNode: function(stateNode) {
+    return instanceProps[stateNode._nativeTag] || null;
+  },
+  updateFiberProps: function(tag, props) {
+    instanceProps[tag] = props;
+  }
+});
+injection.injectEventPluginOrder([
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+]);
+getFiberCurrentPropsFromNode =
+  ReactNativeComponentTree.getFiberCurrentPropsFromNode;
+getInstanceFromNode = ReactNativeComponentTree.getInstanceFromNode;
+getNodeFromInstance = ReactNativeComponentTree.getNodeFromInstance;
+ResponderEventPlugin.injection.injectGlobalResponderHandler({
+  onChange: function(from, to, blockNativeResponder) {
+    null !== to
+      ? UIManager.setJSResponder(to.stateNode._nativeTag, blockNativeResponder)
+      : UIManager.clearJSResponder();
+  }
+});
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+});
+var restoreTarget = null,
   restoreQueue = null;
 function restoreStateOfTarget(target) {
   if ((target = getInstanceFromNode(target))) {
@@ -1142,25 +1162,6 @@ var ReactNativeEventEmitter = Object.freeze({
   }
 });
 RCTEventEmitter.register(ReactNativeEventEmitter);
-injection.injectEventPluginOrder([
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-]);
-getFiberCurrentPropsFromNode =
-  ReactNativeComponentTree.getFiberCurrentPropsFromNode;
-getInstanceFromNode = ReactNativeComponentTree.getInstanceFromNode;
-getNodeFromInstance = ReactNativeComponentTree.getNodeFromInstance;
-ResponderEventPlugin.injection.injectGlobalResponderHandler({
-  onChange: function(from, to, blockNativeResponder) {
-    null !== to
-      ? UIManager.setJSResponder(to.stateNode._nativeTag, blockNativeResponder)
-      : UIManager.clearJSResponder();
-  }
-});
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
-});
 var hasSymbol = "function" === typeof Symbol && Symbol["for"],
   REACT_ELEMENT_TYPE = hasSymbol ? Symbol["for"]("react.element") : 60103,
   REACT_CALL_TYPE = hasSymbol ? Symbol["for"]("react.call") : 60104,
@@ -1173,6 +1174,9 @@ var hasSymbol = "function" === typeof Symbol && Symbol["for"],
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 60110,
   REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol["for"]("react.async_mode") : 60111,
+  REACT_FORWARD_REF_TYPE = hasSymbol
+    ? Symbol["for"]("react.forward_ref")
+    : 60112,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
   if (null === maybeIterable || "undefined" === typeof maybeIterable)
@@ -1294,12 +1298,6 @@ var TouchHistoryMath = {
     },
     noCentroid: -1
   },
-  ReactCurrentOwner =
-    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,
-  ReactGlobalSharedState = Object.freeze({
-    ReactCurrentOwner: ReactCurrentOwner,
-    ReactDebugCurrentFrame: null
-  }),
   objects = {},
   uniqueID = 1,
   emptyObject$2 = {},
@@ -1561,6 +1559,8 @@ function mountSafeCallback(context, callback) {
     }
   };
 }
+var ReactCurrentOwner =
+  React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner;
 function getComponentName(fiber) {
   fiber = fiber.type;
   if ("function" === typeof fiber) return fiber.displayName || fiber.name;
@@ -1822,107 +1822,6 @@ function findCurrentHostFiberWithNoPortals(parent) {
   }
   return null;
 }
-var valueStack = [],
-  index = -1;
-function pop(cursor) {
-  0 > index ||
-    ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
-}
-function push(cursor, value) {
-  index++;
-  valueStack[index] = cursor.current;
-  cursor.current = value;
-}
-var _require = require("ReactFeatureFlags"),
-  debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects,
-  debugRenderPhaseSideEffectsForStrictMode =
-    _require.debugRenderPhaseSideEffectsForStrictMode;
-new Set();
-var contextStackCursor = { current: emptyObject },
-  didPerformWorkStackCursor = { current: !1 },
-  previousContext = emptyObject;
-function getUnmaskedContext(workInProgress) {
-  return isContextProvider(workInProgress)
-    ? previousContext
-    : contextStackCursor.current;
-}
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var contextTypes = workInProgress.type.contextTypes;
-  if (!contextTypes) return emptyObject;
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  )
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  var context = {},
-    key;
-  for (key in contextTypes) context[key] = unmaskedContext[key];
-  instance &&
-    ((workInProgress = workInProgress.stateNode),
-    (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-    (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
-  return context;
-}
-function isContextProvider(fiber) {
-  return 2 === fiber.tag && null != fiber.type.childContextTypes;
-}
-function popContextProvider(fiber) {
-  isContextProvider(fiber) &&
-    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
-}
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    null == contextStackCursor.cursor,
-    "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-  );
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
-}
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode,
-    childContextTypes = fiber.type.childContextTypes;
-  if ("function" !== typeof instance.getChildContext) return parentContext;
-  instance = instance.getChildContext();
-  for (var contextKey in instance)
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
-  return Object.assign({}, parentContext, instance);
-}
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) return !1;
-  var instance = workInProgress.stateNode;
-  instance =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, instance, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
-  return !0;
-}
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-  );
-  if (didChange) {
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    push(contextStackCursor, mergedContext, workInProgress);
-  } else pop(didPerformWorkStackCursor, workInProgress);
-  push(didPerformWorkStackCursor, didChange, workInProgress);
-}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -2006,6 +1905,9 @@ function createFiberFromElement(element, mode, expirationTime) {
             case REACT_CONTEXT_TYPE:
               fiberTag = 12;
               break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = 14;
+              break;
             default:
               if ("number" === typeof type.tag)
                 return (
@@ -2086,6 +1988,45 @@ function onCommitRoot(root) {
 function onCommitUnmount(fiber) {
   "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
 }
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  do {
+    a: switch (workInProgress.tag) {
+      case 0:
+      case 1:
+      case 2:
+      case 5:
+        var owner = workInProgress._debugOwner,
+          source = workInProgress._debugSource;
+        var JSCompiler_inline_result = getComponentName(workInProgress);
+        var ownerName = null;
+        owner && (ownerName = getComponentName(owner));
+        owner = source;
+        JSCompiler_inline_result =
+          "\n    in " +
+          (JSCompiler_inline_result || "Unknown") +
+          (owner
+            ? " (at " +
+              owner.fileName.replace(/^.*[\\\/]/, "") +
+              ":" +
+              owner.lineNumber +
+              ")"
+            : ownerName ? " (created by " + ownerName + ")" : "");
+        break a;
+      default:
+        JSCompiler_inline_result = "";
+    }
+    info += JSCompiler_inline_result;
+    workInProgress = workInProgress["return"];
+  } while (workInProgress);
+  return info;
+}
+var _require = require("ReactFeatureFlags"),
+  enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch,
+  debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects,
+  debugRenderPhaseSideEffectsForStrictMode =
+    _require.debugRenderPhaseSideEffectsForStrictMode;
+new Set();
 function createUpdateQueue(baseState) {
   return {
     baseState: baseState,
@@ -2094,7 +2035,8 @@ function createUpdateQueue(baseState) {
     last: null,
     callbackList: null,
     hasForceUpdate: !1,
-    isInitialized: !1
+    isInitialized: !1,
+    capturedValues: null
   };
 }
 function insertUpdateIntoQueue(queue, update) {
@@ -2107,7 +2049,10 @@ function insertUpdateIntoQueue(queue, update) {
   )
     queue.expirationTime = update.expirationTime;
 }
-function insertUpdateIntoFiber(fiber, update) {
+var q1 = void 0,
+  q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
   var alternateFiber = fiber.alternate,
     queue1 = fiber.updateQueue;
   null === queue1 && (queue1 = fiber.updateQueue = createUpdateQueue(null));
@@ -2116,13 +2061,19 @@ function insertUpdateIntoFiber(fiber, update) {
       null === fiber &&
         (fiber = alternateFiber.updateQueue = createUpdateQueue(null)))
     : (fiber = null);
-  fiber = fiber !== queue1 ? fiber : null;
-  null === fiber
-    ? insertUpdateIntoQueue(queue1, update)
-    : null === queue1.last || null === fiber.last
-      ? (insertUpdateIntoQueue(queue1, update),
-        insertUpdateIntoQueue(fiber, update))
-      : (insertUpdateIntoQueue(queue1, update), (fiber.last = update));
+  q1 = queue1;
+  q2 = fiber !== queue1 ? fiber : null;
+}
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  fiber = q1;
+  var queue2 = q2;
+  null === queue2
+    ? insertUpdateIntoQueue(fiber, update)
+    : null === fiber.last || null === queue2.last
+      ? (insertUpdateIntoQueue(fiber, update),
+        insertUpdateIntoQueue(queue2, update))
+      : (insertUpdateIntoQueue(fiber, update), (queue2.last = update));
 }
 function getStateFromUpdate(update, instance, prevState, props) {
   update = update.partialState;
@@ -2146,6 +2097,7 @@ function processUpdateQueue(
       first: queue.first,
       last: queue.last,
       isInitialized: queue.isInitialized,
+      capturedValues: queue.capturedValues,
       callbackList: null,
       hasForceUpdate: !1
     });
@@ -2197,6 +2149,11 @@ function processUpdateQueue(
         null === updateExpirationTime &&
           (updateExpirationTime = queue.callbackList = []),
         updateExpirationTime.push(update));
+      null !== update.capturedValue &&
+        ((updateExpirationTime = queue.capturedValues),
+        null === updateExpirationTime
+          ? (queue.capturedValues = [update.capturedValue])
+          : updateExpirationTime.push(update.capturedValue));
     }
     update = update.next;
   }
@@ -2204,6 +2161,7 @@ function processUpdateQueue(
     ? (workInProgress.effectTag |= 32)
     : null !== queue.first ||
       queue.hasForceUpdate ||
+      null !== queue.capturedValues ||
       (workInProgress.updateQueue = null);
   didSkip || (queue.baseState = current);
   return current;
@@ -2227,92 +2185,143 @@ function commitCallbacks(queue, context) {
       _callback.call(context);
     }
 }
+function callGetDerivedStateFromCatch(ctor, capturedValues) {
+  for (var resultState = {}, i = 0; i < capturedValues.length; i++) {
+    var partialState = ctor.getDerivedStateFromCatch.call(
+      null,
+      capturedValues[i].value
+    );
+    null !== partialState &&
+      void 0 !== partialState &&
+      Object.assign(resultState, partialState);
+  }
+  return resultState;
+}
 function ReactFiberClassComponent(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
   memoizeState
 ) {
+  function checkShouldComponentUpdate(
+    workInProgress,
+    oldProps,
+    newProps,
+    oldState,
+    newState,
+    newContext
+  ) {
+    if (
+      null === oldProps ||
+      (null !== workInProgress.updateQueue &&
+        workInProgress.updateQueue.hasForceUpdate)
+    )
+      return !0;
+    var instance = workInProgress.stateNode;
+    workInProgress = workInProgress.type;
+    return "function" === typeof instance.shouldComponentUpdate
+      ? instance.shouldComponentUpdate(newProps, newState, newContext)
+      : workInProgress.prototype &&
+        workInProgress.prototype.isPureReactComponent
+        ? !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
+        : !0;
+  }
   function adoptClassInstance(workInProgress, instance) {
     instance.updater = updater;
     workInProgress.stateNode = instance;
     instance._reactInternalFiber = workInProgress;
   }
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+  function callComponentWillReceiveProps(
+    workInProgress,
+    instance,
+    newProps,
+    newContext
+  ) {
+    workInProgress = instance.state;
+    "function" === typeof instance.componentWillReceiveProps &&
+      instance.componentWillReceiveProps(newProps, newContext);
+    "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
+      instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.state !== workInProgress &&
+      updater.enqueueReplaceState(instance, instance.state, null);
+  }
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
     instance = workInProgress.type;
     if ("function" === typeof instance.getDerivedStateFromProps)
       return (
         (debugRenderPhaseSideEffects ||
           (debugRenderPhaseSideEffectsForStrictMode &&
             workInProgress.mode & 2)) &&
-          instance.getDerivedStateFromProps.call(
-            null,
-            props,
-            workInProgress.memoizedState
-          ),
-        instance.getDerivedStateFromProps.call(
-          null,
-          props,
-          workInProgress.memoizedState
-        )
+          instance.getDerivedStateFromProps.call(null, nextProps, prevState),
+        instance.getDerivedStateFromProps.call(null, nextProps, prevState)
       );
   }
-  var updater = {
-    isMounted: isMounted,
-    enqueueSetState: function(instance, partialState, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: partialState,
-        callback: callback,
-        isReplace: !1,
-        isForced: !1,
-        nextCallback: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueReplaceState: function(instance, state, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: state,
-        callback: callback,
-        isReplace: !0,
-        isForced: !1,
-        nextCallback: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueForceUpdate: function(instance, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: null,
-        callback: callback,
-        isReplace: !1,
-        isForced: !0,
-        nextCallback: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    }
-  };
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged,
+    updater = {
+      isMounted: isMounted,
+      enqueueSetState: function(instance, partialState, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: partialState,
+          callback: callback,
+          isReplace: !1,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueReplaceState: function(instance, state, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: state,
+          callback: callback,
+          isReplace: !0,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueForceUpdate: function(instance, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: null,
+          callback: callback,
+          isReplace: !1,
+          isForced: !0,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      }
+    };
   return {
     adoptClassInstance: adoptClassInstance,
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: function(workInProgress, props) {
       var ctor = workInProgress.type,
         unmaskedContext = getUnmaskedContext(workInProgress),
-        needsContext =
-          2 === workInProgress.tag && null != workInProgress.type.contextTypes,
+        needsContext = isContextConsumer(workInProgress),
         context = needsContext
           ? getMaskedContext(workInProgress, unmaskedContext)
           : emptyObject;
@@ -2325,7 +2334,7 @@ function ReactFiberClassComponent(
         null !== ctor.state && void 0 !== ctor.state ? ctor.state : null;
       adoptClassInstance(workInProgress, ctor);
       workInProgress.memoizedState = state;
-      props = callGetDerivedStateFromProps(workInProgress, ctor, props);
+      props = callGetDerivedStateFromProps(workInProgress, ctor, props, state);
       null !== props &&
         void 0 !== props &&
         (workInProgress.memoizedState = Object.assign(
@@ -2333,14 +2342,12 @@ function ReactFiberClassComponent(
           workInProgress.memoizedState,
           props
         ));
-      needsContext &&
-        ((workInProgress = workInProgress.stateNode),
-        (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-        (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
+      needsContext && cacheContext(workInProgress, unmaskedContext, context);
       return ctor;
     },
     mountClassInstance: function(workInProgress, renderExpirationTime) {
-      var current = workInProgress.alternate,
+      var ctor = workInProgress.type,
+        current = workInProgress.alternate,
         instance = workInProgress.stateNode,
         props = workInProgress.pendingProps,
         unmaskedContext = getUnmaskedContext(workInProgress);
@@ -2348,22 +2355,23 @@ function ReactFiberClassComponent(
       instance.state = workInProgress.memoizedState;
       instance.refs = emptyObject;
       instance.context = getMaskedContext(workInProgress, unmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillMount &&
-        "function" !== typeof instance.componentWillMount) ||
-        "function" === typeof workInProgress.type.getDerivedStateFromProps ||
-        ((unmaskedContext = instance.state),
+      "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate ||
+        ("function" !== typeof instance.UNSAFE_componentWillMount &&
+          "function" !== typeof instance.componentWillMount) ||
+        ((ctor = instance.state),
         "function" === typeof instance.componentWillMount &&
           instance.componentWillMount(),
         "function" === typeof instance.UNSAFE_componentWillMount &&
           instance.UNSAFE_componentWillMount(),
-        unmaskedContext !== instance.state &&
+        ctor !== instance.state &&
           updater.enqueueReplaceState(instance, instance.state, null),
-        (unmaskedContext = workInProgress.updateQueue),
-        null !== unmaskedContext &&
+        (ctor = workInProgress.updateQueue),
+        null !== ctor &&
           (instance.state = processUpdateQueue(
             current,
             workInProgress,
-            unmaskedContext,
+            ctor,
             instance,
             props,
             renderExpirationTime
@@ -2371,12 +2379,131 @@ function ReactFiberClassComponent(
       "function" === typeof instance.componentDidMount &&
         (workInProgress.effectTag |= 4);
     },
+    resumeMountClassInstance: function(workInProgress, renderExpirationTime) {
+      var ctor = workInProgress.type,
+        instance = workInProgress.stateNode;
+      instance.props = workInProgress.memoizedProps;
+      instance.state = workInProgress.memoizedState;
+      var oldProps = workInProgress.memoizedProps,
+        newProps = workInProgress.pendingProps,
+        oldContext = instance.context,
+        newUnmaskedContext = getUnmaskedContext(workInProgress);
+      newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
+      var hasNewLifecycles =
+        "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate;
+      hasNewLifecycles ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
+        ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            instance,
+            newProps,
+            newUnmaskedContext
+          ));
+      oldContext = workInProgress.memoizedState;
+      var derivedStateFromCatch = void 0;
+      if (null !== workInProgress.updateQueue) {
+        renderExpirationTime = processUpdateQueue(
+          null,
+          workInProgress,
+          workInProgress.updateQueue,
+          instance,
+          newProps,
+          renderExpirationTime
+        );
+        var updateQueue = workInProgress.updateQueue;
+        null !== updateQueue &&
+          null !== updateQueue.capturedValues &&
+          enableGetDerivedStateFromCatch &&
+          "function" === typeof ctor.getDerivedStateFromCatch &&
+          (derivedStateFromCatch = callGetDerivedStateFromCatch(
+            ctor,
+            updateQueue.capturedValues
+          ));
+      } else renderExpirationTime = oldContext;
+      ctor = void 0;
+      oldProps !== newProps &&
+        (ctor = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      null !== ctor &&
+        void 0 !== ctor &&
+        ((renderExpirationTime =
+          null === renderExpirationTime || void 0 === renderExpirationTime
+            ? ctor
+            : Object.assign({}, renderExpirationTime, ctor)),
+        (updateQueue = workInProgress.updateQueue),
+        null !== updateQueue &&
+          (updateQueue.baseState = Object.assign(
+            {},
+            updateQueue.baseState,
+            ctor
+          )));
+      null !== derivedStateFromCatch &&
+        void 0 !== derivedStateFromCatch &&
+        ((renderExpirationTime =
+          null === renderExpirationTime || void 0 === renderExpirationTime
+            ? derivedStateFromCatch
+            : Object.assign({}, renderExpirationTime, derivedStateFromCatch)),
+        (ctor = workInProgress.updateQueue),
+        null !== ctor &&
+          (ctor.baseState = Object.assign(
+            {},
+            ctor.baseState,
+            derivedStateFromCatch
+          )));
+      if (
+        !(
+          oldProps !== newProps ||
+          oldContext !== renderExpirationTime ||
+          hasContextChanged() ||
+          (null !== workInProgress.updateQueue &&
+            workInProgress.updateQueue.hasForceUpdate)
+        )
+      )
+        return (
+          "function" === typeof instance.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          !1
+        );
+      (oldProps = checkShouldComponentUpdate(
+        workInProgress,
+        oldProps,
+        newProps,
+        oldContext,
+        renderExpirationTime,
+        newUnmaskedContext
+      ))
+        ? (hasNewLifecycles ||
+            ("function" !== typeof instance.UNSAFE_componentWillMount &&
+              "function" !== typeof instance.componentWillMount) ||
+            ("function" === typeof instance.componentWillMount &&
+              instance.componentWillMount(),
+            "function" === typeof instance.UNSAFE_componentWillMount &&
+              instance.UNSAFE_componentWillMount()),
+          "function" === typeof instance.componentDidMount &&
+            (workInProgress.effectTag |= 4))
+        : ("function" === typeof instance.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          memoizeProps(workInProgress, newProps),
+          memoizeState(workInProgress, renderExpirationTime));
+      instance.props = newProps;
+      instance.state = renderExpirationTime;
+      instance.context = newUnmaskedContext;
+      return oldProps;
+    },
     updateClassInstance: function(
       current,
       workInProgress,
       renderExpirationTime
     ) {
-      var instance = workInProgress.stateNode;
+      var ctor = workInProgress.type,
+        instance = workInProgress.stateNode;
       instance.props = workInProgress.memoizedProps;
       instance.state = workInProgress.memoizedState;
       var oldProps = workInProgress.memoizedProps,
@@ -2384,50 +2511,79 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-        "function" !== typeof instance.componentWillReceiveProps) ||
-        "function" === typeof workInProgress.type.getDerivedStateFromProps ||
-        (oldProps === newProps && oldContext === newUnmaskedContext) ||
-        ((oldContext = instance.state),
-        "function" === typeof instance.componentWillReceiveProps &&
-          instance.componentWillReceiveProps(newProps, newUnmaskedContext),
-        "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
-          instance.UNSAFE_componentWillReceiveProps(
+      var hasNewLifecycles =
+        "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate;
+      hasNewLifecycles ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
+        ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            instance,
             newProps,
             newUnmaskedContext
-          ),
-        instance.state !== oldContext &&
-          updater.enqueueReplaceState(instance, instance.state, null));
-      var partialState = void 0;
+          ));
+      oldContext = workInProgress.memoizedState;
+      var derivedStateFromCatch = void 0;
+      if (null !== workInProgress.updateQueue) {
+        renderExpirationTime = processUpdateQueue(
+          current,
+          workInProgress,
+          workInProgress.updateQueue,
+          instance,
+          newProps,
+          renderExpirationTime
+        );
+        var updateQueue = workInProgress.updateQueue;
+        null !== updateQueue &&
+          null !== updateQueue.capturedValues &&
+          enableGetDerivedStateFromCatch &&
+          "function" === typeof ctor.getDerivedStateFromCatch &&
+          (derivedStateFromCatch = callGetDerivedStateFromCatch(
+            ctor,
+            updateQueue.capturedValues
+          ));
+      } else renderExpirationTime = oldContext;
+      ctor = void 0;
       oldProps !== newProps &&
-        (partialState = callGetDerivedStateFromProps(
+        (ctor = callGetDerivedStateFromProps(
           workInProgress,
           instance,
-          newProps
+          newProps,
+          renderExpirationTime
         ));
-      oldContext = workInProgress.memoizedState;
-      renderExpirationTime =
-        null !== workInProgress.updateQueue
-          ? processUpdateQueue(
-              current,
-              workInProgress,
-              workInProgress.updateQueue,
-              instance,
-              newProps,
-              renderExpirationTime
-            )
-          : oldContext;
-      null !== partialState &&
-        void 0 !== partialState &&
-        (renderExpirationTime =
+      null !== ctor &&
+        void 0 !== ctor &&
+        ((renderExpirationTime =
+          null === renderExpirationTime || void 0 === renderExpirationTime
+            ? ctor
+            : Object.assign({}, renderExpirationTime, ctor)),
+        (updateQueue = workInProgress.updateQueue),
+        null !== updateQueue &&
+          (updateQueue.baseState = Object.assign(
+            {},
+            updateQueue.baseState,
+            ctor
+          )));
+      null !== derivedStateFromCatch &&
+        void 0 !== derivedStateFromCatch &&
+        ((renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? partialState
-            : Object.assign({}, renderExpirationTime, partialState));
+            ? derivedStateFromCatch
+            : Object.assign({}, renderExpirationTime, derivedStateFromCatch)),
+        (ctor = workInProgress.updateQueue),
+        null !== ctor &&
+          (ctor.baseState = Object.assign(
+            {},
+            ctor.baseState,
+            derivedStateFromCatch
+          )));
       if (
         !(
           oldProps !== newProps ||
           oldContext !== renderExpirationTime ||
-          didPerformWorkStackCursor.current ||
+          hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2437,35 +2593,23 @@ function ReactFiberClassComponent(
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           !1
         );
-      partialState = renderExpirationTime;
-      if (
-        null === oldProps ||
-        (null !== workInProgress.updateQueue &&
-          workInProgress.updateQueue.hasForceUpdate)
-      )
-        partialState = !0;
-      else {
-        var instance$jscomp$0 = workInProgress.stateNode,
-          type = workInProgress.type;
-        partialState =
-          "function" === typeof instance$jscomp$0.shouldComponentUpdate
-            ? instance$jscomp$0.shouldComponentUpdate(
-                newProps,
-                partialState,
-                newUnmaskedContext
-              )
-            : type.prototype && type.prototype.isPureReactComponent
-              ? !shallowEqual(oldProps, newProps) ||
-                !shallowEqual(oldContext, partialState)
-              : !0;
-      }
-      partialState
-        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-            "function" !== typeof instance.componentWillUpdate) ||
-            "function" ===
-              typeof workInProgress.type.getDerivedStateFromProps ||
+      (derivedStateFromCatch = checkShouldComponentUpdate(
+        workInProgress,
+        oldProps,
+        newProps,
+        oldContext,
+        renderExpirationTime,
+        newUnmaskedContext
+      ))
+        ? (hasNewLifecycles ||
+            ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+              "function" !== typeof instance.componentWillUpdate) ||
             ("function" === typeof instance.componentWillUpdate &&
               instance.componentWillUpdate(
                 newProps,
@@ -2479,17 +2623,23 @@ function ReactFiberClassComponent(
                 newUnmaskedContext
               )),
           "function" === typeof instance.componentDidUpdate &&
-            (workInProgress.effectTag |= 4))
+            (workInProgress.effectTag |= 4),
+          "function" === typeof instance.getSnapshotBeforeUpdate &&
+            (workInProgress.effectTag |= 2048))
         : ("function" !== typeof instance.componentDidUpdate ||
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           memoizeProps(workInProgress, newProps),
           memoizeState(workInProgress, renderExpirationTime));
       instance.props = newProps;
       instance.state = renderExpirationTime;
       instance.context = newUnmaskedContext;
-      return partialState;
+      return derivedStateFromCatch;
     }
   };
 }
@@ -3166,40 +3316,30 @@ function ChildReconciler(shouldTrackSideEffects) {
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
-  mountChildFibers = ChildReconciler(!1),
-  changedBitsStack = [],
-  currentValueStack = [],
-  stack = [],
-  index$1 = -1;
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context.changedBits;
-  currentValueStack[index$1] = context.currentValue;
-  stack[index$1] = providerFiber;
-  context.currentValue = providerFiber.pendingProps.value;
-  context.changedBits = providerFiber.stateNode;
-}
-function popProvider(providerFiber) {
-  var changedBits = changedBitsStack[index$1],
-    currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  --index$1;
-  providerFiber = providerFiber.type.context;
-  providerFiber.currentValue = currentValue;
-  providerFiber.changedBits = changedBits;
-}
+  mountChildFibers = ChildReconciler(!1);
 function ReactFiberBeginWork(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
 ) {
   function reconcileChildren(current, workInProgress, nextChildren) {
-    var renderExpirationTime = workInProgress.expirationTime;
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      workInProgress.expirationTime
+    );
+  }
+  function reconcileChildrenAtExpirationTime(
+    current,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  ) {
     workInProgress.child =
       null === current
         ? mountChildFibers(
@@ -3227,22 +3367,43 @@ function ReactFiberBeginWork(
     current,
     workInProgress,
     shouldUpdate,
-    hasContext
+    hasContext,
+    didCaptureError,
+    renderExpirationTime
   ) {
     markRef(current, workInProgress);
-    if (!shouldUpdate)
+    if (!shouldUpdate && !didCaptureError)
       return (
         hasContext && invalidateContextProvider(workInProgress, !1),
         bailoutOnAlreadyFinishedWork(current, workInProgress)
       );
+    var ctor = workInProgress.type;
     shouldUpdate = workInProgress.stateNode;
     ReactCurrentOwner.current = workInProgress;
-    (debugRenderPhaseSideEffects ||
-      (debugRenderPhaseSideEffectsForStrictMode && workInProgress.mode & 2)) &&
-      shouldUpdate.render();
-    var nextChildren = shouldUpdate.render();
+    !didCaptureError ||
+    (enableGetDerivedStateFromCatch &&
+      "function" === typeof ctor.getDerivedStateFromCatch)
+      ? ((debugRenderPhaseSideEffects ||
+          (debugRenderPhaseSideEffectsForStrictMode &&
+            workInProgress.mode & 2)) &&
+          shouldUpdate.render(),
+        (ctor = shouldUpdate.render()))
+      : (ctor = null);
     workInProgress.effectTag |= 1;
-    reconcileChildren(current, workInProgress, nextChildren);
+    didCaptureError &&
+      (reconcileChildrenAtExpirationTime(
+        current,
+        workInProgress,
+        null,
+        renderExpirationTime
+      ),
+      (workInProgress.child = null));
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      ctor,
+      renderExpirationTime
+    );
     workInProgress.memoizedState = shouldUpdate.state;
     workInProgress.memoizedProps = shouldUpdate.props;
     hasContext && invalidateContextProvider(workInProgress, !0);
@@ -3266,7 +3427,12 @@ function ReactFiberBeginWork(
     changedBits,
     renderExpirationTime
   ) {
-    for (var fiber = workInProgress.child; null !== fiber; ) {
+    var fiber = workInProgress.child;
+    for (
+      null !== fiber && (fiber["return"] = workInProgress);
+      null !== fiber;
+
+    ) {
       switch (fiber.tag) {
         case 12:
           var nextFiber = fiber.stateNode | 0;
@@ -3317,21 +3483,87 @@ function ReactFiberBeginWork(
       fiber = nextFiber;
     }
   }
-  function bailoutOnAlreadyFinishedWork(current, workInProgress) {
-    invariant(
-      null === current || workInProgress.child === current.child,
-      "Resuming work not yet implemented."
-    );
-    if (null !== workInProgress.child) {
-      current = workInProgress.child;
-      var newChild = createWorkInProgress(
-        current,
-        current.pendingProps,
-        current.expirationTime
-      );
-      workInProgress.child = newChild;
-      for (newChild["return"] = workInProgress; null !== current.sibling; )
-        (current = current.sibling),
+  function updateContextProvider(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    var context = workInProgress.type._context,
+      newProps = workInProgress.pendingProps,
+      oldProps = workInProgress.memoizedProps;
+    if (!hasLegacyContextChanged() && oldProps === newProps)
+      return (
+        (workInProgress.stateNode = 0),
+        pushProvider(workInProgress),
+        bailoutOnAlreadyFinishedWork(current, workInProgress)
+      );
+    var newValue = newProps.value;
+    workInProgress.memoizedProps = newProps;
+    if (null === oldProps) newValue = 1073741823;
+    else if (oldProps.value === newProps.value) {
+      if (oldProps.children === newProps.children)
+        return (
+          (workInProgress.stateNode = 0),
+          pushProvider(workInProgress),
+          bailoutOnAlreadyFinishedWork(current, workInProgress)
+        );
+      newValue = 0;
+    } else {
+      var oldValue = oldProps.value;
+      if (
+        (oldValue === newValue &&
+          (0 !== oldValue || 1 / oldValue === 1 / newValue)) ||
+        (oldValue !== oldValue && newValue !== newValue)
+      ) {
+        if (oldProps.children === newProps.children)
+          return (
+            (workInProgress.stateNode = 0),
+            pushProvider(workInProgress),
+            bailoutOnAlreadyFinishedWork(current, workInProgress)
+          );
+        newValue = 0;
+      } else if (
+        ((newValue =
+          "function" === typeof context._calculateChangedBits
+            ? context._calculateChangedBits(oldValue, newValue)
+            : 1073741823),
+        (newValue |= 0),
+        0 === newValue)
+      ) {
+        if (oldProps.children === newProps.children)
+          return (
+            (workInProgress.stateNode = 0),
+            pushProvider(workInProgress),
+            bailoutOnAlreadyFinishedWork(current, workInProgress)
+          );
+      } else
+        propagateContextChange(
+          workInProgress,
+          context,
+          newValue,
+          renderExpirationTime
+        );
+    }
+    workInProgress.stateNode = newValue;
+    pushProvider(workInProgress);
+    reconcileChildren(current, workInProgress, newProps.children);
+    return workInProgress.child;
+  }
+  function bailoutOnAlreadyFinishedWork(current, workInProgress) {
+    invariant(
+      null === current || workInProgress.child === current.child,
+      "Resuming work not yet implemented."
+    );
+    if (null !== workInProgress.child) {
+      current = workInProgress.child;
+      var newChild = createWorkInProgress(
+        current,
+        current.pendingProps,
+        current.expirationTime
+      );
+      workInProgress.child = newChild;
+      for (newChild["return"] = workInProgress; null !== current.sibling; )
+        (current = current.sibling),
           (newChild = newChild.sibling = createWorkInProgress(
             current,
             current.pendingProps,
@@ -3342,34 +3574,23 @@ function ReactFiberBeginWork(
     }
     return workInProgress.child;
   }
-  function bailoutOnLowPriority(current, workInProgress) {
-    switch (workInProgress.tag) {
-      case 3:
-        pushHostRootContext(workInProgress);
-        break;
-      case 2:
-        pushContextProvider(workInProgress);
-        break;
-      case 4:
-        pushHostContainer(
-          workInProgress,
-          workInProgress.stateNode.containerInfo
-        );
-        break;
-      case 13:
-        pushProvider(workInProgress);
-    }
-    return null;
-  }
   var shouldSetTextContent = config.shouldSetTextContent,
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree,
     pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer,
+    pushProvider = newContext.pushProvider,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider,
     enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
   config = ReactFiberClassComponent(
+    legacyContext,
     scheduleWork,
     computeExpirationForFiber,
     function(workInProgress, nextProps) {
@@ -3383,14 +3604,32 @@ function ReactFiberBeginWork(
     callGetDerivedStateFromProps = config.callGetDerivedStateFromProps,
     constructClassInstance = config.constructClassInstance,
     mountClassInstance = config.mountClassInstance,
+    resumeMountClassInstance = config.resumeMountClassInstance,
     updateClassInstance = config.updateClassInstance;
   return {
     beginWork: function(current, workInProgress, renderExpirationTime) {
       if (
         0 === workInProgress.expirationTime ||
         workInProgress.expirationTime > renderExpirationTime
-      )
-        return bailoutOnLowPriority(current, workInProgress);
+      ) {
+        switch (workInProgress.tag) {
+          case 3:
+            pushHostRootContext(workInProgress);
+            break;
+          case 2:
+            pushLegacyContextProvider(workInProgress);
+            break;
+          case 4:
+            pushHostContainer(
+              workInProgress,
+              workInProgress.stateNode.containerInfo
+            );
+            break;
+          case 13:
+            pushProvider(workInProgress);
+        }
+        return null;
+      }
       switch (workInProgress.tag) {
         case 0:
           invariant(
@@ -3415,7 +3654,8 @@ function ReactFiberBeginWork(
                 ((props = callGetDerivedStateFromProps(
                   workInProgress,
                   fn,
-                  props
+                  props,
+                  workInProgress.memoizedState
                 )),
                 null !== props &&
                   void 0 !== props &&
@@ -3424,14 +3664,16 @@ function ReactFiberBeginWork(
                     workInProgress.memoizedState,
                     props
                   ))),
-              (props = pushContextProvider(workInProgress)),
+              (props = pushLegacyContextProvider(workInProgress)),
               adoptClassInstance(workInProgress, fn),
               mountClassInstance(workInProgress, renderExpirationTime),
               (current = finishClassComponent(
                 current,
                 workInProgress,
                 !0,
-                props
+                props,
+                !1,
+                renderExpirationTime
               )))
             : ((workInProgress.tag = 1),
               reconcileChildren(current, workInProgress, fn),
@@ -3442,7 +3684,7 @@ function ReactFiberBeginWork(
           return (
             (props = workInProgress.type),
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? ((fn = getUnmaskedContext(workInProgress)),
                 (fn = getMaskedContext(workInProgress, fn)),
@@ -3458,92 +3700,117 @@ function ReactFiberBeginWork(
             current
           );
         case 2:
-          return (
-            (props = pushContextProvider(workInProgress)),
-            (fn = void 0),
-            null === current
-              ? workInProgress.stateNode
-                ? invariant(!1, "Resuming work not yet implemented.")
-                : (constructClassInstance(
-                    workInProgress,
-                    workInProgress.pendingProps
-                  ),
-                  mountClassInstance(workInProgress, renderExpirationTime),
-                  (fn = !0))
-              : (fn = updateClassInstance(
-                  current,
+          props = pushLegacyContextProvider(workInProgress);
+          null === current
+            ? null === workInProgress.stateNode
+              ? (constructClassInstance(
+                  workInProgress,
+                  workInProgress.pendingProps
+                ),
+                mountClassInstance(workInProgress, renderExpirationTime),
+                (fn = !0))
+              : (fn = resumeMountClassInstance(
                   workInProgress,
                   renderExpirationTime
-                )),
-            finishClassComponent(current, workInProgress, fn, props)
+                ))
+            : (fn = updateClassInstance(
+                current,
+                workInProgress,
+                renderExpirationTime
+              ));
+          unmaskedContext = !1;
+          var updateQueue = workInProgress.updateQueue;
+          null !== updateQueue &&
+            null !== updateQueue.capturedValues &&
+            (unmaskedContext = fn = !0);
+          return finishClassComponent(
+            current,
+            workInProgress,
+            fn,
+            props,
+            unmaskedContext,
+            renderExpirationTime
           );
         case 3:
-          return (
-            pushHostRootContext(workInProgress),
-            (props = workInProgress.updateQueue),
-            null !== props
-              ? ((fn = workInProgress.memoizedState),
-                (props = processUpdateQueue(
-                  current,
+          a: if (
+            (pushHostRootContext(workInProgress),
+            (fn = workInProgress.updateQueue),
+            null !== fn)
+          ) {
+            unmaskedContext = workInProgress.memoizedState;
+            props = processUpdateQueue(
+              current,
+              workInProgress,
+              fn,
+              null,
+              null,
+              renderExpirationTime
+            );
+            workInProgress.memoizedState = props;
+            fn = workInProgress.updateQueue;
+            if (null !== fn && null !== fn.capturedValues) fn = null;
+            else if (unmaskedContext === props) {
+              resetHydrationState();
+              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+              break a;
+            } else fn = props.element;
+            unmaskedContext = workInProgress.stateNode;
+            (null === current || null === current.child) &&
+            unmaskedContext.hydrate &&
+            enterHydrationState(workInProgress)
+              ? ((workInProgress.effectTag |= 2),
+                (workInProgress.child = mountChildFibers(
                   workInProgress,
-                  props,
-                  null,
                   null,
+                  fn,
                   renderExpirationTime
-                )),
-                fn === props
-                  ? (resetHydrationState(),
-                    (current = bailoutOnAlreadyFinishedWork(
-                      current,
-                      workInProgress
-                    )))
-                  : ((fn = props.element),
-                    (unmaskedContext = workInProgress.stateNode),
-                    (null === current || null === current.child) &&
-                    unmaskedContext.hydrate &&
-                    enterHydrationState(workInProgress)
-                      ? ((workInProgress.effectTag |= 2),
-                        (workInProgress.child = mountChildFibers(
-                          workInProgress,
-                          null,
-                          fn,
-                          renderExpirationTime
-                        )))
-                      : (resetHydrationState(),
-                        reconcileChildren(current, workInProgress, fn)),
-                    (workInProgress.memoizedState = props),
-                    (current = workInProgress.child)))
+                )))
               : (resetHydrationState(),
-                (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))),
-            current
-          );
+                reconcileChildren(current, workInProgress, fn));
+            workInProgress.memoizedState = props;
+            current = workInProgress.child;
+          } else
+            resetHydrationState(),
+              (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
+          return current;
         case 5:
-          pushHostContext(workInProgress);
-          null === current && tryToClaimNextHydratableInstance(workInProgress);
-          props = workInProgress.type;
-          var memoizedProps = workInProgress.memoizedProps;
-          fn = workInProgress.pendingProps;
-          unmaskedContext = null !== current ? current.memoizedProps : null;
-          didPerformWorkStackCursor.current || memoizedProps !== fn
-            ? ((memoizedProps = fn.children),
-              shouldSetTextContent(props, fn)
-                ? (memoizedProps = null)
-                : unmaskedContext &&
-                  shouldSetTextContent(props, unmaskedContext) &&
-                  (workInProgress.effectTag |= 16),
-              markRef(current, workInProgress),
-              1073741823 !== renderExpirationTime &&
-              workInProgress.mode & 1 &&
-              shouldDeprioritizeSubtree(props, fn)
-                ? ((workInProgress.expirationTime = 1073741823),
-                  (current = null))
-                : (reconcileChildren(current, workInProgress, memoizedProps),
-                  (workInProgress.memoizedProps = fn),
-                  (current = workInProgress.child)))
-            : (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
+          a: {
+            pushHostContext(workInProgress);
+            null === current &&
+              tryToClaimNextHydratableInstance(workInProgress);
+            props = workInProgress.type;
+            updateQueue = workInProgress.memoizedProps;
+            fn = workInProgress.pendingProps;
+            unmaskedContext = null !== current ? current.memoizedProps : null;
+            if (!hasLegacyContextChanged() && updateQueue === fn) {
+              if (
+                (updateQueue =
+                  workInProgress.mode & 1 &&
+                  shouldDeprioritizeSubtree(props, fn))
+              )
+                workInProgress.expirationTime = 1073741823;
+              if (!updateQueue || 1073741823 !== renderExpirationTime) {
+                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+                break a;
+              }
+            }
+            updateQueue = fn.children;
+            shouldSetTextContent(props, fn)
+              ? (updateQueue = null)
+              : unmaskedContext &&
+                shouldSetTextContent(props, unmaskedContext) &&
+                (workInProgress.effectTag |= 16);
+            markRef(current, workInProgress);
+            1073741823 !== renderExpirationTime &&
+            workInProgress.mode & 1 &&
+            shouldDeprioritizeSubtree(props, fn)
+              ? ((workInProgress.expirationTime = 1073741823),
+                (workInProgress.memoizedProps = fn),
+                (current = null))
+              : (reconcileChildren(current, workInProgress, updateQueue),
+                (workInProgress.memoizedProps = fn),
+                (current = workInProgress.child));
+          }
           return current;
         case 6:
           return (
@@ -3557,7 +3824,7 @@ function ReactFiberBeginWork(
         case 7:
           return (
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
               workInProgress.memoizedProps !== props ||
               (props = workInProgress.memoizedProps),
             (fn = props.children),
@@ -3587,8 +3854,7 @@ function ReactFiberBeginWork(
               workInProgress.stateNode.containerInfo
             ),
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
-            workInProgress.memoizedProps !== props
+            hasLegacyContextChanged() || workInProgress.memoizedProps !== props
               ? (null === current
                   ? (workInProgress.child = reconcileChildFibers(
                       workInProgress,
@@ -3605,10 +3871,21 @@ function ReactFiberBeginWork(
                 )),
             current
           );
+        case 14:
+          return (
+            (renderExpirationTime = workInProgress.type.render),
+            (renderExpirationTime = renderExpirationTime(
+              workInProgress.pendingProps,
+              workInProgress.ref
+            )),
+            reconcileChildren(current, workInProgress, renderExpirationTime),
+            (workInProgress.memoizedProps = renderExpirationTime),
+            workInProgress.child
+          );
         case 10:
           return (
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? (reconcileChildren(
                   current,
@@ -3626,7 +3903,7 @@ function ReactFiberBeginWork(
         case 11:
           return (
             (renderExpirationTime = workInProgress.pendingProps.children),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             (null !== renderExpirationTime &&
               workInProgress.memoizedProps !== renderExpirationTime)
               ? (reconcileChildren(
@@ -3643,117 +3920,56 @@ function ReactFiberBeginWork(
             current
           );
         case 13:
-          props = workInProgress.type.context;
-          fn = workInProgress.pendingProps;
-          unmaskedContext = workInProgress.memoizedProps;
-          if (didPerformWorkStackCursor.current || unmaskedContext !== fn) {
-            workInProgress.memoizedProps = fn;
-            memoizedProps = fn.value;
-            if (null === unmaskedContext) memoizedProps = 1073741823;
-            else {
-              var oldValue = unmaskedContext.value;
-              (oldValue === memoizedProps &&
-                (0 !== oldValue || 1 / oldValue === 1 / memoizedProps)) ||
-              (oldValue !== oldValue && memoizedProps !== memoizedProps)
-                ? (memoizedProps = 0)
-                : ((memoizedProps =
-                    "function" === typeof props.calculateChangedBits
-                      ? props.calculateChangedBits(oldValue, memoizedProps)
-                      : 1073741823),
-                  (memoizedProps |= 0),
-                  0 !== memoizedProps &&
-                    propagateContextChange(
-                      workInProgress,
-                      props,
-                      memoizedProps,
-                      renderExpirationTime
-                    ));
-            }
-            workInProgress.stateNode = memoizedProps;
-            pushProvider(workInProgress);
-            null !== unmaskedContext && unmaskedContext.children === fn.children
-              ? (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))
-              : (reconcileChildren(current, workInProgress, fn.children),
-                (current = workInProgress.child));
+          return updateContextProvider(
+            current,
+            workInProgress,
+            renderExpirationTime
+          );
+        case 12:
+          fn = workInProgress.type;
+          unmaskedContext = workInProgress.pendingProps;
+          var oldProps = workInProgress.memoizedProps;
+          props = fn._currentValue;
+          updateQueue = fn._changedBits;
+          if (
+            hasLegacyContextChanged() ||
+            0 !== updateQueue ||
+            oldProps !== unmaskedContext
+          ) {
+            workInProgress.memoizedProps = unmaskedContext;
+            oldProps = unmaskedContext.unstable_observedBits;
+            if (void 0 === oldProps || null === oldProps) oldProps = 1073741823;
+            workInProgress.stateNode = oldProps;
+            0 !== (updateQueue & oldProps) &&
+              propagateContextChange(
+                workInProgress,
+                fn,
+                updateQueue,
+                renderExpirationTime
+              );
+            renderExpirationTime = unmaskedContext.children;
+            renderExpirationTime = renderExpirationTime(props);
+            reconcileChildren(current, workInProgress, renderExpirationTime);
+            current = workInProgress.child;
           } else
-            (workInProgress.stateNode = 0),
-              pushProvider(workInProgress),
-              (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
+            current = bailoutOnAlreadyFinishedWork(current, workInProgress);
           return current;
-        case 12:
-          unmaskedContext = workInProgress.type;
-          fn = workInProgress.pendingProps;
-          props = unmaskedContext.currentValue;
-          memoizedProps = unmaskedContext.changedBits;
-          0 !== memoizedProps &&
-            propagateContextChange(
-              workInProgress,
-              unmaskedContext,
-              memoizedProps,
-              renderExpirationTime
-            );
-          renderExpirationTime = fn.observedBits;
-          if (void 0 === renderExpirationTime || null === renderExpirationTime)
-            renderExpirationTime = 1073741823;
-          workInProgress.stateNode = renderExpirationTime;
-          renderExpirationTime = fn.children;
-          renderExpirationTime = renderExpirationTime(props);
-          reconcileChildren(current, workInProgress, renderExpirationTime);
-          return workInProgress.child;
         default:
           invariant(
             !1,
             "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
           );
       }
-    },
-    beginFailedWork: function(current, workInProgress, renderExpirationTime) {
-      switch (workInProgress.tag) {
-        case 2:
-          pushContextProvider(workInProgress);
-          break;
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        default:
-          invariant(
-            !1,
-            "Invalid type of work. This error is likely caused by a bug in React. Please file an issue."
-          );
-      }
-      workInProgress.effectTag |= 64;
-      null === current
-        ? (workInProgress.child = null)
-        : workInProgress.child !== current.child &&
-          (workInProgress.child = current.child);
-      if (
-        0 === workInProgress.expirationTime ||
-        workInProgress.expirationTime > renderExpirationTime
-      )
-        return bailoutOnLowPriority(current, workInProgress);
-      workInProgress.firstEffect = null;
-      workInProgress.lastEffect = null;
-      workInProgress.child =
-        null === current
-          ? mountChildFibers(workInProgress, null, null, renderExpirationTime)
-          : reconcileChildFibers(
-              workInProgress,
-              current.child,
-              null,
-              renderExpirationTime
-            );
-      2 === workInProgress.tag &&
-        ((current = workInProgress.stateNode),
-        (workInProgress.memoizedProps = current.props),
-        (workInProgress.memoizedState = current.state));
-      return workInProgress.child;
     }
   };
 }
-function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
+function ReactFiberCompleteWork(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   function markUpdate(workInProgress) {
     workInProgress.effectTag |= 4;
   }
@@ -3767,6 +3983,9 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider,
     prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -3794,11 +4013,21 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
         case 1:
           return null;
         case 2:
-          return popContextProvider(workInProgress), null;
+          return (
+            popLegacyContextProvider(workInProgress),
+            (current = workInProgress.stateNode),
+            (newProps = workInProgress.updateQueue),
+            null !== newProps &&
+              null !== newProps.capturedValues &&
+              ((workInProgress.effectTag &= -65),
+              "function" === typeof current.componentDidCatch
+                ? (workInProgress.effectTag |= 256)
+                : (newProps.capturedValues = null)),
+            null
+          );
         case 3:
           popHostContainer(workInProgress);
-          pop(didPerformWorkStackCursor, workInProgress);
-          pop(contextStackCursor, workInProgress);
+          popTopLevelLegacyContextObject(workInProgress);
           newProps = workInProgress.stateNode;
           newProps.pendingContext &&
             ((newProps.context = newProps.pendingContext),
@@ -3806,6 +4035,10 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           if (null === current || null === current.child)
             popHydrationState(workInProgress), (workInProgress.effectTag &= -3);
           updateHostContainer(workInProgress);
+          current = workInProgress.updateQueue;
+          null !== current &&
+            null !== current.capturedValues &&
+            (workInProgress.effectTag |= 256);
           return null;
         case 5:
           popHostContext(workInProgress);
@@ -3813,10 +4046,10 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           var type = workInProgress.type;
           if (null !== current && null != workInProgress.stateNode) {
             var oldProps = current.memoizedProps,
-              instance = workInProgress.stateNode,
+              _instance = workInProgress.stateNode,
               currentHostContext = getHostContext();
-            instance = prepareUpdate(
-              instance,
+            _instance = prepareUpdate(
+              _instance,
               type,
               oldProps,
               newProps,
@@ -3826,7 +4059,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
             updateHostComponent(
               current,
               workInProgress,
-              instance,
+              _instance,
               type,
               oldProps,
               newProps,
@@ -3978,6 +4211,8 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           return (workInProgress.tag = 7), null;
         case 9:
           return null;
+        case 14:
+          return null;
         case 10:
           return null;
         case 11:
@@ -4006,7 +4241,144 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
     }
   };
 }
-function ReactFiberCommitWork(config, captureError) {
+function ReactFiberUnwindWork(
+  hostContext,
+  legacyContext,
+  newContext,
+  scheduleWork,
+  isAlreadyFailedLegacyErrorBoundary
+) {
+  var popHostContainer = hostContext.popHostContainer,
+    popHostContext = hostContext.popHostContext,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider;
+  return {
+    throwException: function(returnFiber, sourceFiber, rawValue) {
+      sourceFiber.effectTag |= 512;
+      sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+      sourceFiber = {
+        value: rawValue,
+        source: sourceFiber,
+        stack: getStackAddendumByWorkInProgressFiber(sourceFiber)
+      };
+      do {
+        switch (returnFiber.tag) {
+          case 3:
+            ensureUpdateQueues(returnFiber);
+            returnFiber.updateQueue.capturedValues = [sourceFiber];
+            returnFiber.effectTag |= 1024;
+            return;
+          case 2:
+            rawValue = returnFiber.type;
+            var _instance = returnFiber.stateNode;
+            if (
+              0 === (returnFiber.effectTag & 64) &&
+              (("function" === typeof rawValue.getDerivedStateFromCatch &&
+                enableGetDerivedStateFromCatch) ||
+                (null !== _instance &&
+                  "function" === typeof _instance.componentDidCatch &&
+                  !isAlreadyFailedLegacyErrorBoundary(_instance)))
+            ) {
+              ensureUpdateQueues(returnFiber);
+              rawValue = returnFiber.updateQueue;
+              _instance = rawValue.capturedValues;
+              null === _instance
+                ? (rawValue.capturedValues = [sourceFiber])
+                : _instance.push(sourceFiber);
+              returnFiber.effectTag |= 1024;
+              return;
+            }
+        }
+        returnFiber = returnFiber["return"];
+      } while (null !== returnFiber);
+    },
+    unwindWork: function(workInProgress) {
+      switch (workInProgress.tag) {
+        case 2:
+          popLegacyContextProvider(workInProgress);
+          var effectTag = workInProgress.effectTag;
+          return effectTag & 1024
+            ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+              workInProgress)
+            : null;
+        case 3:
+          return (
+            popHostContainer(workInProgress),
+            popTopLevelLegacyContextObject(workInProgress),
+            (effectTag = workInProgress.effectTag),
+            effectTag & 1024
+              ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+                workInProgress)
+              : null
+          );
+        case 5:
+          return popHostContext(workInProgress), null;
+        case 4:
+          return popHostContainer(workInProgress), null;
+        case 13:
+          return popProvider(workInProgress), null;
+        default:
+          return null;
+      }
+    },
+    unwindInterruptedWork: function(interruptedWork) {
+      switch (interruptedWork.tag) {
+        case 2:
+          popLegacyContextProvider(interruptedWork);
+          break;
+        case 3:
+          popHostContainer(interruptedWork);
+          popTopLevelLegacyContextObject(interruptedWork);
+          break;
+        case 5:
+          popHostContext(interruptedWork);
+          break;
+        case 4:
+          popHostContainer(interruptedWork);
+          break;
+        case 13:
+          popProvider(interruptedWork);
+      }
+    }
+  };
+}
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source,
+    stack = errorInfo.stack;
+  null === stack && (stack = getStackAddendumByWorkInProgressFiber(source));
+  null !== source && getComponentName(source);
+  source = null !== stack ? stack : "";
+  errorInfo = errorInfo.value;
+  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
+  try {
+    if (errorInfo instanceof Error) {
+      var message = errorInfo.message,
+        name = errorInfo.name;
+      var errorToHandle = errorInfo;
+      try {
+        errorToHandle.message =
+          (message ? name + ": " + message : name) +
+          "\n\nThis error is located at:" +
+          source;
+      } catch (e) {}
+    } else
+      errorToHandle =
+        "string" === typeof errorInfo
+          ? Error(errorInfo + "\n\nThis error is located at:" + source)
+          : Error("Unspecified error at:" + source);
+    ExceptionsManager.handleException(errorToHandle, !1);
+  } catch (e) {
+    (e && e.suppressReactErrorLogging) || console.error(e);
+  }
+}
+function ReactFiberCommitWork(
+  config,
+  captureError,
+  scheduleWork,
+  computeExpirationForFiber,
+  markLegacyErrorBoundaryAsFailed
+) {
   function safelyDetachRef(current) {
     var ref = current.ref;
     if (null !== ref)
@@ -4016,19 +4388,19 @@ function ReactFiberCommitWork(config, captureError) {
         } catch (refError) {
           captureError(current, refError);
         }
-      else ref.value = null;
+      else ref.current = null;
   }
   function commitUnmount(current) {
     "function" === typeof onCommitUnmount && onCommitUnmount(current);
     switch (current.tag) {
       case 2:
         safelyDetachRef(current);
-        var instance = current.stateNode;
-        if ("function" === typeof instance.componentWillUnmount)
+        var _instance7 = current.stateNode;
+        if ("function" === typeof _instance7.componentWillUnmount)
           try {
-            (instance.props = current.memoizedProps),
-              (instance.state = current.memoizedState),
-              instance.componentWillUnmount();
+            (_instance7.props = current.memoizedProps),
+              (_instance7.state = current.memoizedState),
+              _instance7.componentWillUnmount();
           } catch (unmountError) {
             captureError(current, unmountError);
           }
@@ -4138,6 +4510,34 @@ function ReactFiberCommitWork(config, captureError) {
     removeChild = mutation.removeChild,
     removeChildFromContainer = mutation.removeChildFromContainer;
   return {
+    commitBeforeMutationLifeCycles: function(current, finishedWork) {
+      switch (finishedWork.tag) {
+        case 2:
+          if (finishedWork.effectTag & 2048 && null !== current) {
+            var prevProps = current.memoizedProps,
+              prevState = current.memoizedState;
+            current = finishedWork.stateNode;
+            current.props = finishedWork.memoizedProps;
+            current.state = finishedWork.memoizedState;
+            finishedWork = current.getSnapshotBeforeUpdate(
+              prevProps,
+              prevState
+            );
+            current.__reactInternalSnapshotBeforeUpdate = finishedWork;
+          }
+          break;
+        case 3:
+        case 5:
+        case 6:
+        case 4:
+          break;
+        default:
+          invariant(
+            !1,
+            "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+          );
+      }
+    },
     commitResetTextContent: function(current) {
       resetTextContent(current.stateNode);
     },
@@ -4243,8 +4643,8 @@ function ReactFiberCommitWork(config, captureError) {
         case 2:
           break;
         case 5:
-          var instance = finishedWork.stateNode;
-          if (null != instance) {
+          var _instance8 = finishedWork.stateNode;
+          if (null != _instance8) {
             var newProps = finishedWork.memoizedProps;
             current = null !== current ? current.memoizedProps : newProps;
             var type = finishedWork.type,
@@ -4252,7 +4652,7 @@ function ReactFiberCommitWork(config, captureError) {
             finishedWork.updateQueue = null;
             null !== updatePayload &&
               commitUpdate(
-                instance,
+                _instance8,
                 updatePayload,
                 type,
                 current,
@@ -4266,11 +4666,11 @@ function ReactFiberCommitWork(config, captureError) {
             null !== finishedWork.stateNode,
             "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
           );
-          instance = finishedWork.memoizedProps;
+          _instance8 = finishedWork.memoizedProps;
           commitTextUpdate(
             finishedWork.stateNode,
-            null !== current ? current.memoizedProps : instance,
-            instance
+            null !== current ? current.memoizedProps : _instance8,
+            _instance8
           );
           break;
         case 3:
@@ -4282,46 +4682,52 @@ function ReactFiberCommitWork(config, captureError) {
           );
       }
     },
-    commitLifeCycles: function(current, finishedWork) {
+    commitLifeCycles: function(finishedRoot, current, finishedWork) {
       switch (finishedWork.tag) {
         case 2:
-          var instance = finishedWork.stateNode;
+          finishedRoot = finishedWork.stateNode;
           if (finishedWork.effectTag & 4)
             if (null === current)
-              (instance.props = finishedWork.memoizedProps),
-                (instance.state = finishedWork.memoizedState),
-                instance.componentDidMount();
+              (finishedRoot.props = finishedWork.memoizedProps),
+                (finishedRoot.state = finishedWork.memoizedState),
+                finishedRoot.componentDidMount();
             else {
               var prevProps = current.memoizedProps;
               current = current.memoizedState;
-              instance.props = finishedWork.memoizedProps;
-              instance.state = finishedWork.memoizedState;
-              instance.componentDidUpdate(prevProps, current);
+              finishedRoot.props = finishedWork.memoizedProps;
+              finishedRoot.state = finishedWork.memoizedState;
+              finishedRoot.componentDidUpdate(
+                prevProps,
+                current,
+                finishedRoot.__reactInternalSnapshotBeforeUpdate
+              );
             }
           finishedWork = finishedWork.updateQueue;
-          null !== finishedWork && commitCallbacks(finishedWork, instance);
+          null !== finishedWork && commitCallbacks(finishedWork, finishedRoot);
           break;
         case 3:
-          instance = finishedWork.updateQueue;
-          if (null !== instance) {
-            current = null;
+          current = finishedWork.updateQueue;
+          if (null !== current) {
+            finishedRoot = null;
             if (null !== finishedWork.child)
               switch (finishedWork.child.tag) {
                 case 5:
-                  current = getPublicInstance(finishedWork.child.stateNode);
+                  finishedRoot = getPublicInstance(
+                    finishedWork.child.stateNode
+                  );
                   break;
                 case 2:
-                  current = finishedWork.child.stateNode;
+                  finishedRoot = finishedWork.child.stateNode;
               }
-            commitCallbacks(instance, current);
+            commitCallbacks(current, finishedRoot);
           }
           break;
         case 5:
-          instance = finishedWork.stateNode;
+          finishedRoot = finishedWork.stateNode;
           null === current &&
             finishedWork.effectTag & 4 &&
             commitMount(
-              instance,
+              finishedRoot,
               finishedWork.type,
               finishedWork.memoizedProps,
               finishedWork
@@ -4338,20 +4744,66 @@ function ReactFiberCommitWork(config, captureError) {
           );
       }
     },
+    commitErrorLogging: function(finishedWork, onUncaughtError) {
+      switch (finishedWork.tag) {
+        case 2:
+          var ctor = finishedWork.type;
+          onUncaughtError = finishedWork.stateNode;
+          var updateQueue = finishedWork.updateQueue;
+          invariant(
+            null !== updateQueue && null !== updateQueue.capturedValues,
+            "An error logging effect should not have been scheduled if no errors were captured. This error is likely caused by a bug in React. Please file an issue."
+          );
+          var capturedErrors = updateQueue.capturedValues;
+          updateQueue.capturedValues = null;
+          "function" !== typeof ctor.getDerivedStateFromCatch &&
+            markLegacyErrorBoundaryAsFailed(onUncaughtError);
+          onUncaughtError.props = finishedWork.memoizedProps;
+          onUncaughtError.state = finishedWork.memoizedState;
+          for (ctor = 0; ctor < capturedErrors.length; ctor++) {
+            updateQueue = capturedErrors[ctor];
+            var _error = updateQueue.value,
+              stack = updateQueue.stack;
+            logError(finishedWork, updateQueue);
+            onUncaughtError.componentDidCatch(_error, {
+              componentStack: null !== stack ? stack : ""
+            });
+          }
+          break;
+        case 3:
+          ctor = finishedWork.updateQueue;
+          invariant(
+            null !== ctor && null !== ctor.capturedValues,
+            "An error logging effect should not have been scheduled if no errors were captured. This error is likely caused by a bug in React. Please file an issue."
+          );
+          capturedErrors = ctor.capturedValues;
+          ctor.capturedValues = null;
+          for (ctor = 0; ctor < capturedErrors.length; ctor++)
+            (updateQueue = capturedErrors[ctor]),
+              logError(finishedWork, updateQueue),
+              onUncaughtError(updateQueue.value);
+          break;
+        default:
+          invariant(
+            !1,
+            "This unit of work tag cannot capture errors.  This error is likely caused by a bug in React. Please file an issue."
+          );
+      }
+    },
     commitAttachRef: function(finishedWork) {
       var ref = finishedWork.ref;
       if (null !== ref) {
-        var instance = finishedWork.stateNode;
+        var _instance6 = finishedWork.stateNode;
         switch (finishedWork.tag) {
           case 5:
-            finishedWork = getPublicInstance(instance);
+            finishedWork = getPublicInstance(_instance6);
             break;
           default:
-            finishedWork = instance;
+            finishedWork = _instance6;
         }
         "function" === typeof ref
           ? ref(finishedWork)
-          : (ref.value = finishedWork);
+          : (ref.current = finishedWork);
       }
     },
     commitDetachRef: function(current) {
@@ -4359,12 +4811,12 @@ function ReactFiberCommitWork(config, captureError) {
       null !== current &&
         ("function" === typeof current
           ? current(null)
-          : (current.value = null));
+          : (current.current = null));
     }
   };
 }
 var NO_CONTEXT = {};
-function ReactFiberHostContext(config) {
+function ReactFiberHostContext(config, stack) {
   function requiredContext(c) {
     invariant(
       c !== NO_CONTEXT,
@@ -4373,10 +4825,13 @@ function ReactFiberHostContext(config) {
     return c;
   }
   var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext,
-    contextStackCursor = { current: NO_CONTEXT },
-    contextFiberStackCursor = { current: NO_CONTEXT },
-    rootInstanceStackCursor = { current: NO_CONTEXT };
+    getRootHostContext = config.getRootHostContext;
+  config = stack.createCursor;
+  var push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = config(NO_CONTEXT),
+    contextFiberStackCursor = config(NO_CONTEXT),
+    rootInstanceStackCursor = config(NO_CONTEXT);
   return {
     getHostContext: function() {
       return requiredContext(contextStackCursor.current);
@@ -4395,8 +4850,10 @@ function ReactFiberHostContext(config) {
     },
     pushHostContainer: function(fiber, nextRootInstance) {
       push(rootInstanceStackCursor, nextRootInstance, fiber);
-      nextRootInstance = getRootHostContext(nextRootInstance);
       push(contextFiberStackCursor, fiber, fiber);
+      push(contextStackCursor, NO_CONTEXT, fiber);
+      nextRootInstance = getRootHostContext(nextRootInstance);
+      pop(contextStackCursor, fiber);
       push(contextStackCursor, nextRootInstance, fiber);
     },
     pushHostContext: function(fiber) {
@@ -4406,10 +4863,6 @@ function ReactFiberHostContext(config) {
       context !== rootInstance &&
         (push(contextFiberStackCursor, fiber, fiber),
         push(contextStackCursor, rootInstance, fiber));
-    },
-    resetHostContainer: function() {
-      contextStackCursor.current = NO_CONTEXT;
-      rootInstanceStackCursor.current = NO_CONTEXT;
     }
   };
 }
@@ -4569,56 +5022,278 @@ function ReactFiberHydrationContext(config) {
     }
   };
 }
+function ReactFiberLegacyContext(stack) {
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    workInProgress = workInProgress.stateNode;
+    workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    workInProgress.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
+  function isContextProvider(fiber) {
+    return 2 === fiber.tag && null != fiber.type.childContextTypes;
+  }
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode,
+      childContextTypes = fiber.type.childContextTypes;
+    if ("function" !== typeof instance.getChildContext) return parentContext;
+    instance = instance.getChildContext();
+    for (var contextKey in instance)
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    return Object.assign({}, parentContext, instance);
+  }
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = createCursor(emptyObject),
+    didPerformWorkStackCursor = createCursor(!1),
+    previousContext = emptyObject;
+  return {
+    getUnmaskedContext: function(workInProgress) {
+      return isContextProvider(workInProgress)
+        ? previousContext
+        : contextStackCursor.current;
+    },
+    cacheContext: cacheContext,
+    getMaskedContext: function(workInProgress, unmaskedContext) {
+      var contextTypes = workInProgress.type.contextTypes;
+      if (!contextTypes) return emptyObject;
+      var instance = workInProgress.stateNode;
+      if (
+        instance &&
+        instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+      )
+        return instance.__reactInternalMemoizedMaskedChildContext;
+      var context = {},
+        key;
+      for (key in contextTypes) context[key] = unmaskedContext[key];
+      instance && cacheContext(workInProgress, unmaskedContext, context);
+      return context;
+    },
+    hasContextChanged: function() {
+      return didPerformWorkStackCursor.current;
+    },
+    isContextConsumer: function(fiber) {
+      return 2 === fiber.tag && null != fiber.type.contextTypes;
+    },
+    isContextProvider: isContextProvider,
+    popContextProvider: function(fiber) {
+      isContextProvider(fiber) &&
+        (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+    },
+    popTopLevelContextObject: function(fiber) {
+      pop(didPerformWorkStackCursor, fiber);
+      pop(contextStackCursor, fiber);
+    },
+    pushTopLevelContextObject: function(fiber, context, didChange) {
+      invariant(
+        null == contextStackCursor.cursor,
+        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+      );
+      push(contextStackCursor, context, fiber);
+      push(didPerformWorkStackCursor, didChange, fiber);
+    },
+    processChildContext: processChildContext,
+    pushContextProvider: function(workInProgress) {
+      if (!isContextProvider(workInProgress)) return !1;
+      var instance = workInProgress.stateNode;
+      instance =
+        (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+        emptyObject;
+      previousContext = contextStackCursor.current;
+      push(contextStackCursor, instance, workInProgress);
+      push(
+        didPerformWorkStackCursor,
+        didPerformWorkStackCursor.current,
+        workInProgress
+      );
+      return !0;
+    },
+    invalidateContextProvider: function(workInProgress, didChange) {
+      var instance = workInProgress.stateNode;
+      invariant(
+        instance,
+        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+      );
+      if (didChange) {
+        var mergedContext = processChildContext(
+          workInProgress,
+          previousContext
+        );
+        instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+        pop(didPerformWorkStackCursor, workInProgress);
+        pop(contextStackCursor, workInProgress);
+        push(contextStackCursor, mergedContext, workInProgress);
+      } else pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    },
+    findCurrentUnmaskedContext: function(fiber) {
+      for (
+        invariant(
+          2 === isFiberMountedImpl(fiber) && 2 === fiber.tag,
+          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+        );
+        3 !== fiber.tag;
+
+      ) {
+        if (isContextProvider(fiber))
+          return fiber.stateNode.__reactInternalMemoizedMergedChildContext;
+        fiber = fiber["return"];
+        invariant(
+          fiber,
+          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+      return fiber.stateNode.context;
+    }
+  };
+}
+function ReactFiberNewContext(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    providerCursor = createCursor(null),
+    valueCursor = createCursor(null),
+    changedBitsCursor = createCursor(0);
+  return {
+    pushProvider: function(providerFiber) {
+      var context = providerFiber.type._context;
+      push(changedBitsCursor, context._changedBits, providerFiber);
+      push(valueCursor, context._currentValue, providerFiber);
+      push(providerCursor, providerFiber, providerFiber);
+      context._currentValue = providerFiber.pendingProps.value;
+      context._changedBits = providerFiber.stateNode;
+    },
+    popProvider: function(providerFiber) {
+      var changedBits = changedBitsCursor.current,
+        currentValue = valueCursor.current;
+      pop(providerCursor, providerFiber);
+      pop(valueCursor, providerFiber);
+      pop(changedBitsCursor, providerFiber);
+      providerFiber = providerFiber.type._context;
+      providerFiber._currentValue = currentValue;
+      providerFiber._changedBits = changedBits;
+    }
+  };
+}
+function ReactFiberStack() {
+  var valueStack = [],
+    index = -1;
+  return {
+    createCursor: function(defaultValue) {
+      return { current: defaultValue };
+    },
+    isEmpty: function() {
+      return -1 === index;
+    },
+    pop: function(cursor) {
+      0 > index ||
+        ((cursor.current = valueStack[index]),
+        (valueStack[index] = null),
+        index--);
+    },
+    push: function(cursor, value) {
+      index++;
+      valueStack[index] = cursor.current;
+      cursor.current = value;
+    },
+    checkThatStackIsEmpty: function() {},
+    resetStackAfterFatalErrorInDev: function() {}
+  };
+}
 function ReactFiberScheduler(config) {
+  function resetStack() {
+    if (null !== nextUnitOfWork)
+      for (
+        var interruptedWork = nextUnitOfWork["return"];
+        null !== interruptedWork;
+
+      )
+        unwindInterruptedWork(interruptedWork),
+          (interruptedWork = interruptedWork["return"]);
+    nextRoot = null;
+    nextRenderExpirationTime = 0;
+    nextUnitOfWork = null;
+    isRootReadyForCommit = !1;
+  }
+  function isAlreadyFailedLegacyErrorBoundary(instance) {
+    return (
+      null !== legacyErrorBoundariesThatAlreadyFailed &&
+      legacyErrorBoundariesThatAlreadyFailed.has(instance)
+    );
+  }
   function completeUnitOfWork(workInProgress$jscomp$0) {
     for (;;) {
-      var next = completeWork(
-          workInProgress$jscomp$0.alternate,
-          workInProgress$jscomp$0,
-          nextRenderExpirationTime
-        ),
+      var current = workInProgress$jscomp$0.alternate,
         returnFiber = workInProgress$jscomp$0["return"],
         siblingFiber = workInProgress$jscomp$0.sibling;
-      var workInProgress = workInProgress$jscomp$0;
-      if (
-        1073741823 === nextRenderExpirationTime ||
-        1073741823 !== workInProgress.expirationTime
-      ) {
-        if (2 !== workInProgress.tag && 3 !== workInProgress.tag)
-          var newExpirationTime = 0;
-        else
-          (newExpirationTime = workInProgress.updateQueue),
-            (newExpirationTime =
-              null === newExpirationTime
-                ? 0
-                : newExpirationTime.expirationTime);
-        for (var child = workInProgress.child; null !== child; )
-          0 !== child.expirationTime &&
-            (0 === newExpirationTime ||
-              newExpirationTime > child.expirationTime) &&
-            (newExpirationTime = child.expirationTime),
-            (child = child.sibling);
-        workInProgress.expirationTime = newExpirationTime;
-      }
-      if (null !== next) return next;
-      null !== returnFiber &&
-        (null === returnFiber.firstEffect &&
-          (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
-        null !== workInProgress$jscomp$0.lastEffect &&
-          (null !== returnFiber.lastEffect &&
-            (returnFiber.lastEffect.nextEffect =
-              workInProgress$jscomp$0.firstEffect),
-          (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
-        1 < workInProgress$jscomp$0.effectTag &&
-          (null !== returnFiber.lastEffect
-            ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
-            : (returnFiber.firstEffect = workInProgress$jscomp$0),
-          (returnFiber.lastEffect = workInProgress$jscomp$0)));
-      if (null !== siblingFiber) return siblingFiber;
-      if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
-      else {
-        workInProgress$jscomp$0.stateNode.isReadyForCommit = !0;
-        break;
+      if (0 === (workInProgress$jscomp$0.effectTag & 512)) {
+        current = completeWork(
+          current,
+          workInProgress$jscomp$0,
+          nextRenderExpirationTime
+        );
+        var workInProgress = workInProgress$jscomp$0;
+        if (
+          1073741823 === nextRenderExpirationTime ||
+          1073741823 !== workInProgress.expirationTime
+        ) {
+          b: switch (workInProgress.tag) {
+            case 3:
+            case 2:
+              var newExpirationTime = workInProgress.updateQueue;
+              newExpirationTime =
+                null === newExpirationTime
+                  ? 0
+                  : newExpirationTime.expirationTime;
+              break b;
+            default:
+              newExpirationTime = 0;
+          }
+          for (var child = workInProgress.child; null !== child; )
+            0 !== child.expirationTime &&
+              (0 === newExpirationTime ||
+                newExpirationTime > child.expirationTime) &&
+              (newExpirationTime = child.expirationTime),
+              (child = child.sibling);
+          workInProgress.expirationTime = newExpirationTime;
+        }
+        if (null !== current) return current;
+        null !== returnFiber &&
+          0 === (returnFiber.effectTag & 512) &&
+          (null === returnFiber.firstEffect &&
+            (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
+          null !== workInProgress$jscomp$0.lastEffect &&
+            (null !== returnFiber.lastEffect &&
+              (returnFiber.lastEffect.nextEffect =
+                workInProgress$jscomp$0.firstEffect),
+            (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
+          1 < workInProgress$jscomp$0.effectTag &&
+            (null !== returnFiber.lastEffect
+              ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
+              : (returnFiber.firstEffect = workInProgress$jscomp$0),
+            (returnFiber.lastEffect = workInProgress$jscomp$0)));
+        if (null !== siblingFiber) return siblingFiber;
+        if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+        else {
+          isRootReadyForCommit = !0;
+          break;
+        }
+      } else {
+        workInProgress$jscomp$0 = unwindWork(workInProgress$jscomp$0);
+        if (null !== workInProgress$jscomp$0)
+          return (
+            (workInProgress$jscomp$0.effectTag &= 2559), workInProgress$jscomp$0
+          );
+        null !== returnFiber &&
+          ((returnFiber.firstEffect = returnFiber.lastEffect = null),
+          (returnFiber.effectTag |= 512));
+        if (null !== siblingFiber) return siblingFiber;
+        if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+        else break;
       }
     }
     return null;
@@ -4633,263 +5308,114 @@ function ReactFiberScheduler(config) {
     ReactCurrentOwner.current = null;
     return next;
   }
-  function performFailedUnitOfWork(workInProgress) {
-    var next = beginFailedWork(
-      workInProgress.alternate,
-      workInProgress,
-      nextRenderExpirationTime
-    );
-    null === next && (next = completeUnitOfWork(workInProgress));
-    ReactCurrentOwner.current = null;
-    return next;
-  }
-  function workLoop(isAsync) {
-    if (null !== capturedErrors)
-      if (isAsync)
-        for (; null !== nextUnitOfWork && !shouldYield(); )
-          nextUnitOfWork = hasCapturedError(nextUnitOfWork)
-            ? performFailedUnitOfWork(nextUnitOfWork)
-            : performUnitOfWork(nextUnitOfWork);
-      else
-        for (; null !== nextUnitOfWork; )
-          nextUnitOfWork = hasCapturedError(nextUnitOfWork)
-            ? performFailedUnitOfWork(nextUnitOfWork)
-            : performUnitOfWork(nextUnitOfWork);
-    else if (isAsync)
-      for (; null !== nextUnitOfWork && !shouldYield(); )
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-    else
-      for (; null !== nextUnitOfWork; )
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-  }
   function renderRoot(root, expirationTime, isAsync) {
     invariant(
       !isWorking,
       "renderRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
     );
     isWorking = !0;
-    root.isReadyForCommit = !1;
     if (
-      root !== nextRoot ||
       expirationTime !== nextRenderExpirationTime ||
+      root !== nextRoot ||
       null === nextUnitOfWork
-    ) {
-      for (; -1 < index; ) (valueStack[index] = null), index--;
-      previousContext = emptyObject;
-      contextStackCursor.current = emptyObject;
-      didPerformWorkStackCursor.current = !1;
-      for (var i = index$1; -1 < i; i--) {
-        var context = stack[i].type.context;
-        context.currentValue = context.defaultValue;
-        context.changedBits = 0;
-        changedBitsStack[i] = null;
-        currentValueStack[i] = null;
-        stack[i] = null;
-      }
-      index$1 = -1;
-      resetHostContainer();
-      nextRoot = root;
-      nextRenderExpirationTime = expirationTime;
-      nextUnitOfWork = createWorkInProgress(
-        nextRoot.current,
-        null,
-        expirationTime
-      );
-    }
-    i = !1;
-    context = null;
-    try {
-      workLoop(isAsync);
-    } catch (e) {
-      (i = !0), (context = e);
-    }
-    for (; i; ) {
-      if (didFatal) {
-        firstUncaughtError = context;
-        break;
-      }
-      expirationTime = nextUnitOfWork;
-      if (null === expirationTime) didFatal = !0;
-      else {
-        var boundary = captureError(expirationTime, context);
-        invariant(
-          null !== boundary,
-          "Should have found an error boundary. This error is likely caused by a bug in React. Please file an issue."
-        );
-        if (!didFatal) {
-          try {
-            i = boundary;
-            context = isAsync;
-            for (boundary = i; null !== expirationTime; ) {
-              switch (expirationTime.tag) {
-                case 2:
-                  popContextProvider(expirationTime);
-                  break;
-                case 5:
-                  popHostContext(expirationTime);
-                  break;
-                case 3:
-                  popHostContainer(expirationTime);
-                  break;
-                case 4:
-                  popHostContainer(expirationTime);
-                  break;
-                case 13:
-                  popProvider(expirationTime);
-              }
-              if (
-                expirationTime === boundary ||
-                expirationTime.alternate === boundary
-              )
-                break;
-              expirationTime = expirationTime["return"];
-            }
-            nextUnitOfWork = performFailedUnitOfWork(i);
-            workLoop(context);
-          } catch (e) {
-            i = !0;
-            context = e;
-            continue;
-          }
+    )
+      resetStack(),
+        (nextRoot = root),
+        (nextRenderExpirationTime = expirationTime),
+        (nextUnitOfWork = createWorkInProgress(
+          nextRoot.current,
+          null,
+          nextRenderExpirationTime
+        )),
+        (root.pendingCommitExpirationTime = 0);
+    var didFatal = !1;
+    do {
+      try {
+        if (isAsync)
+          for (; null !== nextUnitOfWork && !shouldYield(); )
+            nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+        else
+          for (; null !== nextUnitOfWork; )
+            nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+      } catch (thrownValue) {
+        if (null === nextUnitOfWork) {
+          didFatal = !0;
+          onUncaughtError(thrownValue);
           break;
         }
-      }
-    }
-    isAsync = firstUncaughtError;
-    didFatal = isWorking = !1;
-    firstUncaughtError = null;
-    null !== isAsync && onUncaughtError(isAsync);
-    return root.isReadyForCommit ? root.current.alternate : null;
-  }
-  function captureError(failedWork, error$jscomp$0) {
-    var boundary = (ReactCurrentOwner.current = null),
-      errorBoundaryFound = !1,
-      willRetry = !1,
-      errorBoundaryName = null;
-    if (3 === failedWork.tag)
-      (boundary = failedWork), isFailedBoundary(failedWork) && (didFatal = !0);
-    else
-      for (
-        var node = failedWork["return"];
-        null !== node && null === boundary;
-
-      ) {
-        2 === node.tag
-          ? "function" === typeof node.stateNode.componentDidCatch &&
-            ((errorBoundaryFound = !0),
-            (errorBoundaryName = getComponentName(node)),
-            (boundary = node),
-            (willRetry = !0))
-          : 3 === node.tag && (boundary = node);
-        if (isFailedBoundary(node)) {
-          if (
-            isUnmounting ||
-            (null !== commitPhaseBoundaries &&
-              (commitPhaseBoundaries.has(node) ||
-                (null !== node.alternate &&
-                  commitPhaseBoundaries.has(node.alternate))))
-          )
-            return null;
-          boundary = null;
-          willRetry = !1;
+        isAsync = nextUnitOfWork;
+        var returnFiber = isAsync["return"];
+        if (null === returnFiber) {
+          didFatal = !0;
+          onUncaughtError(thrownValue);
+          break;
         }
-        node = node["return"];
+        throwException(returnFiber, isAsync, thrownValue);
+        nextUnitOfWork = completeUnitOfWork(isAsync);
       }
-    if (null !== boundary) {
-      null === failedBoundaries && (failedBoundaries = new Set());
-      failedBoundaries.add(boundary);
-      var info = "";
-      node = failedWork;
-      do {
-        a: switch (node.tag) {
-          case 0:
-          case 1:
+      break;
+    } while (1);
+    isWorking = !1;
+    if (didFatal || null !== nextUnitOfWork) return null;
+    if (isRootReadyForCommit)
+      return (
+        (root.pendingCommitExpirationTime = expirationTime),
+        root.current.alternate
+      );
+    invariant(
+      !1,
+      "Expired work should have completed. This error is likely caused by a bug in React. Please file an issue."
+    );
+  }
+  function scheduleCapture(sourceFiber, boundaryFiber, value, expirationTime) {
+    sourceFiber = {
+      value: value,
+      source: sourceFiber,
+      stack: getStackAddendumByWorkInProgressFiber(sourceFiber)
+    };
+    insertUpdateIntoFiber(boundaryFiber, {
+      expirationTime: expirationTime,
+      partialState: null,
+      callback: null,
+      isReplace: !1,
+      isForced: !1,
+      capturedValue: sourceFiber,
+      next: null
+    });
+    scheduleWork(boundaryFiber, expirationTime);
+  }
+  function onCommitPhaseError(fiber$jscomp$0, error) {
+    a: {
+      invariant(
+        !isWorking || isCommitting,
+        "dispatch: Cannot dispatch during the render phase."
+      );
+      for (var fiber = fiber$jscomp$0["return"]; null !== fiber; ) {
+        switch (fiber.tag) {
           case 2:
-          case 5:
-            var owner = node._debugOwner,
-              source = node._debugSource;
-            var JSCompiler_inline_result = getComponentName(node);
-            var ownerName = null;
-            owner && (ownerName = getComponentName(owner));
-            owner = source;
-            JSCompiler_inline_result =
-              "\n    in " +
-              (JSCompiler_inline_result || "Unknown") +
-              (owner
-                ? " (at " +
-                  owner.fileName.replace(/^.*[\\\/]/, "") +
-                  ":" +
-                  owner.lineNumber +
-                  ")"
-                : ownerName ? " (created by " + ownerName + ")" : "");
+            var instance = fiber.stateNode;
+            if (
+              "function" === typeof fiber.type.getDerivedStateFromCatch ||
+              ("function" === typeof instance.componentDidCatch &&
+                !isAlreadyFailedLegacyErrorBoundary(instance))
+            ) {
+              scheduleCapture(fiber$jscomp$0, fiber, error, 1);
+              fiber$jscomp$0 = void 0;
+              break a;
+            }
+            break;
+          case 3:
+            scheduleCapture(fiber$jscomp$0, fiber, error, 1);
+            fiber$jscomp$0 = void 0;
             break a;
-          default:
-            JSCompiler_inline_result = "";
         }
-        info += JSCompiler_inline_result;
-        node = node["return"];
-      } while (node);
-      node = info;
-      failedWork = getComponentName(failedWork);
-      null === capturedErrors && (capturedErrors = new Map());
-      error$jscomp$0 = {
-        componentName: failedWork,
-        componentStack: node,
-        error: error$jscomp$0,
-        errorBoundary: errorBoundaryFound ? boundary.stateNode : null,
-        errorBoundaryFound: errorBoundaryFound,
-        errorBoundaryName: errorBoundaryName,
-        willRetry: willRetry
-      };
-      capturedErrors.set(boundary, error$jscomp$0);
-      try {
-        var componentStack = error$jscomp$0.componentStack,
-          error = error$jscomp$0.error;
-        if (error instanceof Error) {
-          var message = error.message,
-            name = error.name;
-          var errorToHandle = error;
-          try {
-            errorToHandle.message =
-              (message ? name + ": " + message : name) +
-              "\n\nThis error is located at:" +
-              componentStack;
-          } catch (e) {}
-        } else
-          errorToHandle =
-            "string" === typeof error
-              ? Error(error + "\n\nThis error is located at:" + componentStack)
-              : Error("Unspecified error at:" + componentStack);
-        ExceptionsManager.handleException(errorToHandle, !1);
-      } catch (e) {
-        (e && e.suppressReactErrorLogging) || console.error(e);
+        fiber = fiber["return"];
       }
-      isCommitting
-        ? (null === commitPhaseBoundaries &&
-            (commitPhaseBoundaries = new Set()),
-          commitPhaseBoundaries.add(boundary))
-        : scheduleErrorRecovery(boundary);
-      return boundary;
+      3 === fiber$jscomp$0.tag &&
+        scheduleCapture(fiber$jscomp$0, fiber$jscomp$0, error, 1);
+      fiber$jscomp$0 = void 0;
     }
-    null === firstUncaughtError && (firstUncaughtError = error$jscomp$0);
-    return null;
-  }
-  function hasCapturedError(fiber) {
-    return (
-      null !== capturedErrors &&
-      (capturedErrors.has(fiber) ||
-        (null !== fiber.alternate && capturedErrors.has(fiber.alternate)))
-    );
-  }
-  function isFailedBoundary(fiber) {
-    return (
-      null !== failedBoundaries &&
-      (failedBoundaries.has(fiber) ||
-        (null !== fiber.alternate && failedBoundaries.has(fiber.alternate)))
-    );
-  }
-  function computeAsyncExpiration() {
-    return 20 * ((((recalculateCurrentTime() + 100) / 20) | 0) + 1);
+    return fiber$jscomp$0;
   }
   function computeExpirationForFiber(fiber) {
     fiber =
@@ -4900,7 +5426,7 @@ function ReactFiberScheduler(config) {
           : fiber.mode & 1
             ? isBatchingInteractiveUpdates
               ? 10 * ((((recalculateCurrentTime() + 50) / 10) | 0) + 1)
-              : computeAsyncExpiration()
+              : 25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1)
             : 1;
     isBatchingInteractiveUpdates &&
       (0 === lowestPendingInteractiveExpirationTime ||
@@ -4909,39 +5435,41 @@ function ReactFiberScheduler(config) {
     return fiber;
   }
   function scheduleWork(fiber, expirationTime) {
-    return scheduleWorkImpl(fiber, expirationTime, !1);
-  }
-  function scheduleWorkImpl(fiber, expirationTime) {
-    for (; null !== fiber; ) {
-      if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
-        fiber.expirationTime = expirationTime;
-      null !== fiber.alternate &&
-        (0 === fiber.alternate.expirationTime ||
-          fiber.alternate.expirationTime > expirationTime) &&
-        (fiber.alternate.expirationTime = expirationTime);
-      if (null === fiber["return"])
-        if (3 === fiber.tag) {
-          var root = fiber.stateNode;
-          !isWorking &&
-            root === nextRoot &&
-            expirationTime < nextRenderExpirationTime &&
-            ((nextUnitOfWork = nextRoot = null),
-            (nextRenderExpirationTime = 0));
-          requestWork(root, expirationTime);
-          !isWorking &&
-            root === nextRoot &&
-            expirationTime < nextRenderExpirationTime &&
-            ((nextUnitOfWork = nextRoot = null),
-            (nextRenderExpirationTime = 0));
-        } else break;
-      fiber = fiber["return"];
+    a: {
+      for (; null !== fiber; ) {
+        if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
+          fiber.expirationTime = expirationTime;
+        null !== fiber.alternate &&
+          (0 === fiber.alternate.expirationTime ||
+            fiber.alternate.expirationTime > expirationTime) &&
+          (fiber.alternate.expirationTime = expirationTime);
+        if (null === fiber["return"])
+          if (3 === fiber.tag) {
+            var root = fiber.stateNode;
+            !isWorking &&
+              0 !== nextRenderExpirationTime &&
+              expirationTime < nextRenderExpirationTime &&
+              resetStack();
+            (isWorking && !isCommitting && nextRoot === root) ||
+              requestWork(root, expirationTime);
+            nestedUpdateCount > NESTED_UPDATE_LIMIT &&
+              invariant(
+                !1,
+                "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
+              );
+          } else {
+            expirationTime = void 0;
+            break a;
+          }
+        fiber = fiber["return"];
+      }
+      expirationTime = void 0;
     }
-  }
-  function scheduleErrorRecovery(fiber) {
-    scheduleWorkImpl(fiber, 1, !0);
+    return expirationTime;
   }
   function recalculateCurrentTime() {
-    return (mostRecentCurrentTime = (((now() - startTime) / 10) | 0) + 2);
+    mostRecentCurrentTimeMs = now() - originalStartTimeMs;
+    return (mostRecentCurrentTime = ((mostRecentCurrentTimeMs / 10) | 0) + 2);
   }
   function syncUpdates(fn, a, b, c, d) {
     var previousExpirationContext = expirationContext;
@@ -4957,18 +5485,13 @@ function ReactFiberScheduler(config) {
       if (expirationTime > callbackExpirationTime) return;
       cancelDeferredCallback(callbackID);
     }
-    var currentMs = now() - startTime;
+    var currentMs = now() - originalStartTimeMs;
     callbackExpirationTime = expirationTime;
     callbackID = scheduleDeferredCallback(performAsyncWork, {
       timeout: 10 * (expirationTime - 2) - currentMs
     });
   }
   function requestWork(root, expirationTime) {
-    nestedUpdateCount > NESTED_UPDATE_LIMIT &&
-      invariant(
-        !1,
-        "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
-      );
     if (null === root.nextScheduledRoot)
       (root.remainingExpirationTime = expirationTime),
         null === lastScheduledRoot
@@ -4991,7 +5514,7 @@ function ReactFiberScheduler(config) {
           (nextFlushedExpirationTime = 1),
           performWorkOnRoot(root, 1, !1))
         : 1 === expirationTime
-          ? performWork(1, !1, null)
+          ? performSyncWork()
           : scheduleCallbackWithExpiration(expirationTime));
   }
   function findHighestPriorityRoot() {
@@ -5041,7 +5564,8 @@ function ReactFiberScheduler(config) {
       }
     previousScheduledRoot = nextFlushedRoot;
     null !== previousScheduledRoot &&
-    previousScheduledRoot === highestPriorityRoot
+    previousScheduledRoot === highestPriorityRoot &&
+    1 === highestPriorityWork
       ? nestedUpdateCount++
       : (nestedUpdateCount = 0);
     nextFlushedRoot = highestPriorityRoot;
@@ -5050,6 +5574,9 @@ function ReactFiberScheduler(config) {
   function performAsyncWork(dl) {
     performWork(0, !0, dl);
   }
+  function performSyncWork() {
+    performWork(1, !1, null);
+  }
   function performWork(minExpirationTime, isAsync, dl) {
     deadline = dl;
     findHighestPriorityRoot();
@@ -5086,10 +5613,10 @@ function ReactFiberScheduler(config) {
       scheduleCallbackWithExpiration(nextFlushedExpirationTime);
     deadline = null;
     deadlineDidExpire = !1;
-    nestedUpdateCount = 0;
     finishRendering();
   }
   function finishRendering() {
+    nestedUpdateCount = 0;
     if (null !== completedBatches) {
       var batches = completedBatches;
       completedBatches = null;
@@ -5154,18 +5681,43 @@ function ReactFiberScheduler(config) {
       expirationTime.current !== finishedWork,
       "Cannot commit the same tree as before. This is probably a bug related to the return field. This error is likely caused by a bug in React. Please file an issue."
     );
-    expirationTime.isReadyForCommit = !1;
+    firstBatch = expirationTime.pendingCommitExpirationTime;
+    invariant(
+      0 !== firstBatch,
+      "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue."
+    );
+    expirationTime.pendingCommitExpirationTime = 0;
+    var currentTime = recalculateCurrentTime();
     ReactCurrentOwner.current = null;
-    1 < finishedWork.effectTag
-      ? null !== finishedWork.lastEffect
-        ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-          (firstBatch = finishedWork.firstEffect))
-        : (firstBatch = finishedWork)
-      : (firstBatch = finishedWork.firstEffect);
+    if (1 < finishedWork.effectTag)
+      if (null !== finishedWork.lastEffect) {
+        finishedWork.lastEffect.nextEffect = finishedWork;
+        var firstEffect = finishedWork.firstEffect;
+      } else firstEffect = finishedWork;
+    else firstEffect = finishedWork.firstEffect;
     prepareForCommit(expirationTime.containerInfo);
-    for (nextEffect = firstBatch; null !== nextEffect; ) {
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
       var didError = !1,
-        _error = void 0;
+        error = void 0;
+      try {
+        for (; null !== nextEffect; )
+          nextEffect.effectTag & 2048 &&
+            commitBeforeMutationLifeCycles(nextEffect.alternate, nextEffect),
+            (nextEffect = nextEffect.nextEffect);
+      } catch (e) {
+        (didError = !0), (error = e);
+      }
+      didError &&
+        (invariant(
+          null !== nextEffect,
+          "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+        ),
+        onCommitPhaseError(nextEffect, error),
+        null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+    }
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
+      didError = !1;
+      error = void 0;
       try {
         for (; null !== nextEffect; ) {
           var effectTag = nextEffect.effectTag;
@@ -5174,7 +5726,7 @@ function ReactFiberScheduler(config) {
             var current = nextEffect.alternate;
             null !== current && commitDetachRef(current);
           }
-          switch (effectTag & -242) {
+          switch (effectTag & 14) {
             case 2:
               commitPlacement(nextEffect);
               nextEffect.effectTag &= -3;
@@ -5188,65 +5740,46 @@ function ReactFiberScheduler(config) {
               commitWork(nextEffect.alternate, nextEffect);
               break;
             case 8:
-              (isUnmounting = !0),
-                commitDeletion(nextEffect),
-                (isUnmounting = !1);
+              commitDeletion(nextEffect);
           }
           nextEffect = nextEffect.nextEffect;
         }
       } catch (e) {
-        (didError = !0), (_error = e);
+        (didError = !0), (error = e);
       }
       didError &&
         (invariant(
           null !== nextEffect,
           "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
         ),
-        captureError(nextEffect, _error),
+        onCommitPhaseError(nextEffect, error),
         null !== nextEffect && (nextEffect = nextEffect.nextEffect));
     }
     resetAfterCommit(expirationTime.containerInfo);
     expirationTime.current = finishedWork;
-    for (nextEffect = firstBatch; null !== nextEffect; ) {
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
       effectTag = !1;
       current = void 0;
       try {
-        for (; null !== nextEffect; ) {
+        for (
+          firstEffect = expirationTime,
+            didError = currentTime,
+            error = firstBatch;
+          null !== nextEffect;
+
+        ) {
           var effectTag$jscomp$0 = nextEffect.effectTag;
           effectTag$jscomp$0 & 36 &&
-            commitLifeCycles(nextEffect.alternate, nextEffect);
+            commitLifeCycles(
+              firstEffect,
+              nextEffect.alternate,
+              nextEffect,
+              didError,
+              error
+            );
+          effectTag$jscomp$0 & 256 &&
+            commitErrorLogging(nextEffect, onUncaughtError);
           effectTag$jscomp$0 & 128 && commitAttachRef(nextEffect);
-          if (effectTag$jscomp$0 & 64)
-            switch (((firstBatch = nextEffect),
-            (didError = void 0),
-            null !== capturedErrors &&
-              ((didError = capturedErrors.get(firstBatch)),
-              capturedErrors["delete"](firstBatch),
-              null == didError &&
-                null !== firstBatch.alternate &&
-                ((firstBatch = firstBatch.alternate),
-                (didError = capturedErrors.get(firstBatch)),
-                capturedErrors["delete"](firstBatch))),
-            invariant(
-              null != didError,
-              "No error for given unit of work. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            firstBatch.tag)) {
-              case 2:
-                firstBatch.stateNode.componentDidCatch(didError.error, {
-                  componentStack: didError.componentStack
-                });
-                break;
-              case 3:
-                null === firstUncaughtError &&
-                  (firstUncaughtError = didError.error);
-                break;
-              default:
-                invariant(
-                  !1,
-                  "Invalid type of work. This error is likely caused by a bug in React. Please file an issue."
-                );
-            }
           var next = nextEffect.nextEffect;
           nextEffect.nextEffect = null;
           nextEffect = next;
@@ -5259,20 +5792,13 @@ function ReactFiberScheduler(config) {
           null !== nextEffect,
           "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
         ),
-        captureError(nextEffect, current),
+        onCommitPhaseError(nextEffect, current),
         null !== nextEffect && (nextEffect = nextEffect.nextEffect));
     }
     isWorking = isCommitting = !1;
     "function" === typeof onCommitRoot && onCommitRoot(finishedWork.stateNode);
-    commitPhaseBoundaries &&
-      (commitPhaseBoundaries.forEach(scheduleErrorRecovery),
-      (commitPhaseBoundaries = null));
-    null !== firstUncaughtError &&
-      ((finishedWork = firstUncaughtError),
-      (firstUncaughtError = null),
-      onUncaughtError(finishedWork));
     finishedWork = expirationTime.current.expirationTime;
-    0 === finishedWork && (failedBoundaries = capturedErrors = null);
+    0 === finishedWork && (legacyErrorBoundariesThatAlreadyFailed = null);
     root.remainingExpirationTime = finishedWork;
   }
   function shouldYield() {
@@ -5289,28 +5815,57 @@ function ReactFiberScheduler(config) {
     nextFlushedRoot.remainingExpirationTime = 0;
     hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
   }
-  var hostContext = ReactFiberHostContext(config),
-    hydrationContext = ReactFiberHydrationContext(config),
-    popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext,
-    resetHostContainer = hostContext.resetHostContainer,
-    _ReactFiberBeginWork = ReactFiberBeginWork(
+  var stack = ReactFiberStack(),
+    hostContext = ReactFiberHostContext(config, stack),
+    legacyContext = ReactFiberLegacyContext(stack);
+  stack = ReactFiberNewContext(stack);
+  var hydrationContext = ReactFiberHydrationContext(config),
+    beginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      stack,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
-    ),
-    beginWork = _ReactFiberBeginWork.beginWork,
-    beginFailedWork = _ReactFiberBeginWork.beginFailedWork,
-    completeWork = ReactFiberCompleteWork(config, hostContext, hydrationContext)
-      .completeWork;
-  hostContext = ReactFiberCommitWork(config, captureError);
-  var commitResetTextContent = hostContext.commitResetTextContent,
+    ).beginWork,
+    completeWork = ReactFiberCompleteWork(
+      config,
+      hostContext,
+      legacyContext,
+      stack,
+      hydrationContext
+    ).completeWork;
+  hostContext = ReactFiberUnwindWork(
+    hostContext,
+    legacyContext,
+    stack,
+    scheduleWork,
+    isAlreadyFailedLegacyErrorBoundary
+  );
+  var throwException = hostContext.throwException,
+    unwindWork = hostContext.unwindWork,
+    unwindInterruptedWork = hostContext.unwindInterruptedWork;
+  hostContext = ReactFiberCommitWork(
+    config,
+    onCommitPhaseError,
+    scheduleWork,
+    computeExpirationForFiber,
+    function(instance) {
+      null === legacyErrorBoundariesThatAlreadyFailed
+        ? (legacyErrorBoundariesThatAlreadyFailed = new Set([instance]))
+        : legacyErrorBoundariesThatAlreadyFailed.add(instance);
+    },
+    recalculateCurrentTime
+  );
+  var commitBeforeMutationLifeCycles =
+      hostContext.commitBeforeMutationLifeCycles,
+    commitResetTextContent = hostContext.commitResetTextContent,
     commitPlacement = hostContext.commitPlacement,
     commitDeletion = hostContext.commitDeletion,
     commitWork = hostContext.commitWork,
     commitLifeCycles = hostContext.commitLifeCycles,
+    commitErrorLogging = hostContext.commitErrorLogging,
     commitAttachRef = hostContext.commitAttachRef,
     commitDetachRef = hostContext.commitDetachRef,
     now = config.now,
@@ -5318,8 +5873,9 @@ function ReactFiberScheduler(config) {
     cancelDeferredCallback = config.cancelDeferredCallback,
     prepareForCommit = config.prepareForCommit,
     resetAfterCommit = config.resetAfterCommit,
-    startTime = now(),
+    originalStartTimeMs = now(),
     mostRecentCurrentTime = 2,
+    mostRecentCurrentTimeMs = originalStartTimeMs,
     lastUniqueAsyncExpiration = 0,
     expirationContext = 0,
     isWorking = !1,
@@ -5327,13 +5883,9 @@ function ReactFiberScheduler(config) {
     nextRoot = null,
     nextRenderExpirationTime = 0,
     nextEffect = null,
-    capturedErrors = null,
-    failedBoundaries = null,
-    commitPhaseBoundaries = null,
-    firstUncaughtError = null,
-    didFatal = !1,
     isCommitting = !1,
-    isUnmounting = !1,
+    isRootReadyForCommit = !1,
+    legacyErrorBoundariesThatAlreadyFailed = null,
     firstScheduledRoot = null,
     lastScheduledRoot = null,
     callbackExpirationTime = 0,
@@ -5354,6 +5906,7 @@ function ReactFiberScheduler(config) {
     nestedUpdateCount = 0,
     timeHeuristicForUnitOfWork = 1;
   return {
+    recalculateCurrentTime: recalculateCurrentTime,
     computeExpirationForFiber: computeExpirationForFiber,
     scheduleWork: scheduleWork,
     requestWork: requestWork,
@@ -5362,7 +5915,10 @@ function ReactFiberScheduler(config) {
         !isRendering,
         "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
       );
+      nextFlushedRoot = root;
+      nextFlushedExpirationTime = expirationTime;
       performWorkOnRoot(root, expirationTime, !1);
+      performSyncWork();
       finishRendering();
     },
     batchedUpdates: function(fn, a) {
@@ -5373,7 +5929,7 @@ function ReactFiberScheduler(config) {
       } finally {
         (isBatchingUpdates = previousIsBatchingUpdates) ||
           isRendering ||
-          performWork(1, !1, null);
+          performSyncWork();
       }
     },
     unbatchedUpdates: function(fn, a) {
@@ -5397,8 +5953,7 @@ function ReactFiberScheduler(config) {
       try {
         return syncUpdates(fn, a);
       } finally {
-        (isBatchingUpdates = previousIsBatchingUpdates),
-          performWork(1, !1, null);
+        (isBatchingUpdates = previousIsBatchingUpdates), performSyncWork();
       }
     },
     flushControlled: function(fn) {
@@ -5414,7 +5969,8 @@ function ReactFiberScheduler(config) {
     },
     deferredUpdates: function(fn) {
       var previousExpirationContext = expirationContext;
-      expirationContext = computeAsyncExpiration();
+      expirationContext =
+        25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1);
       try {
         return fn();
       } finally {
@@ -5438,7 +5994,7 @@ function ReactFiberScheduler(config) {
         (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
           (isBatchingUpdates = previousIsBatchingUpdates) ||
             isRendering ||
-            performWork(1, !1, null);
+            performSyncWork();
       }
     },
     flushInteractiveUpdates: function() {
@@ -5448,11 +6004,12 @@ function ReactFiberScheduler(config) {
         (lowestPendingInteractiveExpirationTime = 0));
     },
     computeUniqueAsyncExpiration: function() {
-      var result = computeAsyncExpiration();
+      var result = 25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1);
       result <= lastUniqueAsyncExpiration &&
         (result = lastUniqueAsyncExpiration + 1);
       return (lastUniqueAsyncExpiration = result);
-    }
+    },
+    legacyContext: legacyContext
   };
 }
 function ReactFiberReconciler$1(config) {
@@ -5460,33 +6017,14 @@ function ReactFiberReconciler$1(config) {
     element,
     container,
     parentComponent,
+    currentTime,
     expirationTime,
     callback
   ) {
-    var current = container.current;
+    currentTime = container.current;
     if (parentComponent) {
       parentComponent = parentComponent._reactInternalFiber;
-      var parentContext;
-      b: {
-        invariant(
-          2 === isFiberMountedImpl(parentComponent) &&
-            2 === parentComponent.tag,
-          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-        );
-        for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
-          if (isContextProvider(parentContext)) {
-            parentContext =
-              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
-            break b;
-          }
-          parentContext = parentContext["return"];
-          invariant(
-            parentContext,
-            "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-          );
-        }
-        parentContext = parentContext.stateNode.context;
-      }
+      var parentContext = findCurrentUnmaskedContext(parentComponent);
       parentComponent = isContextProvider(parentComponent)
         ? processChildContext(parentComponent, parentContext)
         : parentContext;
@@ -5495,15 +6033,16 @@ function ReactFiberReconciler$1(config) {
       ? (container.context = parentComponent)
       : (container.pendingContext = parentComponent);
     container = callback;
-    insertUpdateIntoFiber(current, {
+    insertUpdateIntoFiber(currentTime, {
       expirationTime: expirationTime,
       partialState: { element: element },
       callback: void 0 === container ? null : container,
       isReplace: !1,
       isForced: !1,
+      capturedValue: null,
       next: null
     });
-    scheduleWork(current, expirationTime);
+    scheduleWork(currentTime, expirationTime);
     return expirationTime;
   }
   function findHostInstance(fiber) {
@@ -5512,8 +6051,13 @@ function ReactFiberReconciler$1(config) {
   }
   var getPublicInstance = config.getPublicInstance;
   config = ReactFiberScheduler(config);
-  var computeExpirationForFiber = config.computeExpirationForFiber,
-    scheduleWork = config.scheduleWork;
+  var recalculateCurrentTime = config.recalculateCurrentTime,
+    computeExpirationForFiber = config.computeExpirationForFiber,
+    scheduleWork = config.scheduleWork,
+    legacyContext = config.legacyContext,
+    findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
   return {
     createContainer: function(containerInfo, isAsync, hydrate) {
       isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
@@ -5521,28 +6065,47 @@ function ReactFiberReconciler$1(config) {
         current: isAsync,
         containerInfo: containerInfo,
         pendingChildren: null,
-        remainingExpirationTime: 0,
-        isReadyForCommit: !1,
+        pendingCommitExpirationTime: 0,
         finishedWork: null,
         context: null,
         pendingContext: null,
         hydrate: hydrate,
+        remainingExpirationTime: 0,
         firstBatch: null,
         nextScheduledRoot: null
       };
       return (isAsync.stateNode = containerInfo);
     },
     updateContainer: function(element, container, parentComponent, callback) {
-      var expirationTime = computeExpirationForFiber(container.current);
+      var current = container.current,
+        currentTime = recalculateCurrentTime();
+      current = computeExpirationForFiber(current);
       return updateContainerAtExpirationTime(
         element,
         container,
         parentComponent,
+        currentTime,
+        current,
+        callback
+      );
+    },
+    updateContainerAtExpirationTime: function(
+      element,
+      container,
+      parentComponent,
+      expirationTime,
+      callback
+    ) {
+      var currentTime = recalculateCurrentTime();
+      return updateContainerAtExpirationTime(
+        element,
+        container,
+        parentComponent,
+        currentTime,
         expirationTime,
         callback
       );
     },
-    updateContainerAtExpirationTime: updateContainerAtExpirationTime,
     flushRoot: config.flushRoot,
     requestWork: config.requestWork,
     computeUniqueAsyncExpiration: config.computeUniqueAsyncExpiration,
@@ -5663,7 +6226,8 @@ var ReactFiberReconciler$2 = Object.freeze({ default: ReactFiberReconciler$1 }),
   frameDeadlineObject = {
     timeRemaining: function() {
       return frameDeadline - now();
-    }
+    },
+    didTimeout: !1
   };
 function setTimeoutCallback() {
   frameDeadline = now() + 5;
@@ -5973,7 +6537,6 @@ var roots = new Map(),
         }
       },
       ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin,
-      ReactGlobalSharedState: ReactGlobalSharedState,
       ReactNativeComponentTree: ReactNativeComponentTree,
       ReactNativePropRegistry: ReactNativePropRegistry,
       TouchHistoryMath: TouchHistoryMath,
@@ -5998,7 +6561,7 @@ NativeRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.0-alpha.0",
+  version: "16.3.1",
   rendererPackageName: "react-native-renderer"
 });
 var ReactNativeRenderer$2 = Object.freeze({ default: ReactNativeRenderer }),
diff --git a/Libraries/Renderer/shims/ReactFabric.js b/Libraries/Renderer/shims/ReactFabric.js
index 4a396c224cd4ff..4162ca62fef73d 100644
--- a/Libraries/Renderer/shims/ReactFabric.js
+++ b/Libraries/Renderer/shims/ReactFabric.js
@@ -9,6 +9,8 @@
  */
 'use strict';
 
+const BatchedBridge = require('BatchedBridge');
+
 // TODO @sema: Adjust types
 import type {ReactNativeType} from 'ReactNativeTypes';
 
@@ -20,4 +22,6 @@ if (__DEV__) {
   ReactFabric = require('ReactFabric-prod');
 }
 
+BatchedBridge.registerCallableModule('ReactFabric', ReactFabric);
+
 module.exports = (ReactFabric: ReactNativeType);
diff --git a/Libraries/Renderer/shims/ReactFabricInternals.js b/Libraries/Renderer/shims/ReactFabricInternals.js
new file mode 100644
index 00000000000000..d360803412a14a
--- /dev/null
+++ b/Libraries/Renderer/shims/ReactFabricInternals.js
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule ReactFabricInternals
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactFabric');
+
+import type {NativeMethodsMixinType} from 'ReactNativeTypes';
+
+const {
+  NativeMethodsMixin,
+  ReactNativeBridgeEventPlugin,
+  createReactNativeComponentClass,
+} = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+module.exports = {
+  NativeMethodsMixin: ((NativeMethodsMixin: any): $Exact<
+    NativeMethodsMixinType,
+  >),
+  ReactNativeBridgeEventPlugin,
+  createReactNativeComponentClass,
+};
diff --git a/Libraries/Renderer/shims/ReactFeatureFlags.js b/Libraries/Renderer/shims/ReactFeatureFlags.js
index 44add71fc5c5e2..5a2b32e747e601 100644
--- a/Libraries/Renderer/shims/ReactFeatureFlags.js
+++ b/Libraries/Renderer/shims/ReactFeatureFlags.js
@@ -12,7 +12,7 @@
 const ReactFeatureFlags = {
   debugRenderPhaseSideEffects: false,
   debugRenderPhaseSideEffectsForStrictMode: false,
-  warnAboutDeprecatedLifecycles: true,
+  warnAboutDeprecatedLifecycles: false,
 };
 
 module.exports = ReactFeatureFlags;
diff --git a/Libraries/Renderer/shims/ReactGlobalSharedState.js b/Libraries/Renderer/shims/ReactGlobalSharedState.js
deleted file mode 100644
index 089449a9491972..00000000000000
--- a/Libraries/Renderer/shims/ReactGlobalSharedState.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @providesModule ReactGlobalSharedState
- */
-
-'use strict';
-
-const {
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('ReactNative');
-
-module.exports =
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactGlobalSharedState;
diff --git a/Libraries/Renderer/shims/ReactTypes.js b/Libraries/Renderer/shims/ReactTypes.js
index 26ada3c5e842f5..689ed18bf95294 100644
--- a/Libraries/Renderer/shims/ReactTypes.js
+++ b/Libraries/Renderer/shims/ReactTypes.js
@@ -62,7 +62,7 @@ export type ReactProvider<T> = {
 
 export type ReactProviderType<T> = {
   $$typeof: Symbol | number,
-  context: ReactContext<T>,
+  _context: ReactContext<T>,
 };
 
 export type ReactConsumer<T> = {
@@ -72,7 +72,7 @@ export type ReactConsumer<T> = {
   ref: null,
   props: {
     children: (value: T) => ReactNodeList,
-    bits?: number,
+    unstable_observedBits?: number,
   },
 };
 
@@ -80,10 +80,12 @@ export type ReactContext<T> = {
   $$typeof: Symbol | number,
   Consumer: ReactContext<T>,
   Provider: ReactProviderType<T>,
-  calculateChangedBits: ((a: T, b: T) => number) | null,
-  defaultValue: T,
-  currentValue: T,
-  changedBits: number,
+
+  _calculateChangedBits: ((a: T, b: T) => number) | null,
+  _defaultValue: T,
+
+  _currentValue: T,
+  _changedBits: number,
 
   // DEV only
   _currentRenderer?: Object | null,
@@ -99,5 +101,5 @@ export type ReactPortal = {
 };
 
 export type RefObject = {|
-  value: any,
+  current: any,
 |};
diff --git a/Libraries/Settings/RCTSettingsManager.h b/Libraries/Settings/RCTSettingsManager.h
index 2a2f920fc143a2..a331074c64a4f4 100644
--- a/Libraries/Settings/RCTSettingsManager.h
+++ b/Libraries/Settings/RCTSettingsManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/Settings/RCTSettingsManager.m b/Libraries/Settings/RCTSettingsManager.m
index d41dc3a9d0e934..79c18707016c53 100644
--- a/Libraries/Settings/RCTSettingsManager.m
+++ b/Libraries/Settings/RCTSettingsManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSettingsManager.h"
diff --git a/Libraries/Settings/Settings.android.js b/Libraries/Settings/Settings.android.js
index d13a32ba9218bc..946c4aa9cde219 100644
--- a/Libraries/Settings/Settings.android.js
+++ b/Libraries/Settings/Settings.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Settings
  * @flow
diff --git a/Libraries/Settings/Settings.ios.js b/Libraries/Settings/Settings.ios.js
index beda544b43e51c..08f1be6a1c8ae1 100644
--- a/Libraries/Settings/Settings.ios.js
+++ b/Libraries/Settings/Settings.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Settings
  * @flow
diff --git a/Libraries/Share/Share.js b/Libraries/Share/Share.js
index 44d7433218bed2..e41b29db8e54d8 100644
--- a/Libraries/Share/Share.js
+++ b/Libraries/Share/Share.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Share
  * @flow
diff --git a/Libraries/Storage/AsyncStorage.js b/Libraries/Storage/AsyncStorage.js
index fb54d6beef95b8..4e262e6150c36f 100644
--- a/Libraries/Storage/AsyncStorage.js
+++ b/Libraries/Storage/AsyncStorage.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AsyncStorage
  * @noflow
@@ -22,9 +20,9 @@ const RCTAsyncStorage = NativeModules.AsyncRocksDBStorage ||
 
 /**
  * `AsyncStorage` is a simple, unencrypted, asynchronous, persistent, key-value
- * storage system that is global to the app.  It should be used instead of 
+ * storage system that is global to the app.  It should be used instead of
  * LocalStorage.
- * 
+ *
  * See http://facebook.github.io/react-native/docs/asyncstorage.html
  */
 var AsyncStorage = {
@@ -34,7 +32,7 @@ var AsyncStorage = {
 
   /**
    * Fetches an item for a `key` and invokes a callback upon completion.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#getitem
    */
   getItem: function(
@@ -58,7 +56,7 @@ var AsyncStorage = {
 
   /**
    * Sets the value for a `key` and invokes a callback upon completion.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#setitem
    */
   setItem: function(
@@ -81,7 +79,7 @@ var AsyncStorage = {
 
   /**
    * Removes an item for a `key` and invokes a callback upon completion.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#removeitem
    */
   removeItem: function(
@@ -131,7 +129,7 @@ var AsyncStorage = {
    * Erases *all* `AsyncStorage` for all clients, libraries, etc. You probably
    * don't want to call this; use `removeItem` or `multiRemove` to clear only
    * your app's keys.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#clear
    */
   clear: function(callback?: ?(error: ?Error) => void): Promise {
@@ -175,9 +173,9 @@ var AsyncStorage = {
    * indicate which key caused the error.
    */
 
-  /** 
+  /**
    * Flushes any pending requests using a single batch call to get the data.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#flushgetrequests
    * */
   flushGetRequests: function(): void {
@@ -211,7 +209,7 @@ var AsyncStorage = {
    * This allows you to batch the fetching of items given an array of `key`
    * inputs. Your callback will be invoked with an array of corresponding
    * key-value pairs found.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#multiget
    */
   multiGet: function(
@@ -275,7 +273,7 @@ var AsyncStorage = {
 
   /**
    * Call this to batch the deletion of all keys in the `keys` array.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#multiremove
    */
   multiRemove: function(
@@ -298,9 +296,9 @@ var AsyncStorage = {
   /**
    * Batch operation to merge in existing and new values for a given set of
    * keys. This assumes that the values are stringified JSON.
-   * 
+   *
    * **NOTE**: This is not supported by all native implementations.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#multimerge
    */
   multiMerge: function(
diff --git a/Libraries/StyleSheet/ColorPropType.js b/Libraries/StyleSheet/ColorPropType.js
index faca884315ee0e..60e362275bfbc9 100644
--- a/Libraries/StyleSheet/ColorPropType.js
+++ b/Libraries/StyleSheet/ColorPropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ColorPropType
  */
diff --git a/Libraries/StyleSheet/EdgeInsetsPropType.js b/Libraries/StyleSheet/EdgeInsetsPropType.js
index 9c38774478744b..307c6be2e5daed 100644
--- a/Libraries/StyleSheet/EdgeInsetsPropType.js
+++ b/Libraries/StyleSheet/EdgeInsetsPropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EdgeInsetsPropType
  * @flow
diff --git a/Libraries/StyleSheet/LayoutPropTypes.js b/Libraries/StyleSheet/LayoutPropTypes.js
index 03f49e3ce99cab..5921334c5b7cea 100644
--- a/Libraries/StyleSheet/LayoutPropTypes.js
+++ b/Libraries/StyleSheet/LayoutPropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LayoutPropTypes
  * @flow
diff --git a/Libraries/StyleSheet/PointPropType.js b/Libraries/StyleSheet/PointPropType.js
index 7257e365dd97d0..a55628adbee7d3 100644
--- a/Libraries/StyleSheet/PointPropType.js
+++ b/Libraries/StyleSheet/PointPropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PointPropType
  * @flow
diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index c32d1a9b64a0df..3320c459b68ca0 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -1,13 +1,12 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StyleSheet
  * @flow
+ * @format
  */
 'use strict';
 
@@ -19,33 +18,35 @@ const StyleSheetValidation = require('StyleSheetValidation');
 const flatten = require('flattenStyle');
 
 import type {
-  StyleSheetStyle as _StyleSheetStyle,
-  Styles as _Styles,
-  StyleSheet as _StyleSheet,
-  StyleValue as _StyleValue,
-  StyleObj,
+  ____StyleSheetInternalStyleIdentifier_Internal as StyleSheetInternalStyleIdentifier,
+  ____Styles_Internal,
+  ____DangerouslyImpreciseStyleProp_Internal,
+  ____ViewStyleProp_Internal,
+  ____TextStyleProp_Internal,
+  ____ImageStyleProp_Internal,
+  LayoutStyle,
 } from 'StyleSheetTypes';
 
-export type StyleProp = StyleObj;
-export type Styles = _Styles;
-export type StyleSheet<S> = _StyleSheet<S>;
-export type StyleValue = _StyleValue;
-export type StyleSheetStyle = _StyleSheetStyle;
+export type DangerouslyImpreciseStyleProp = ____DangerouslyImpreciseStyleProp_Internal;
+export type ViewStyleProp = ____ViewStyleProp_Internal;
+export type TextStyleProp = ____TextStyleProp_Internal;
+export type ImageStyleProp = ____ImageStyleProp_Internal;
 
 let hairlineWidth = PixelRatio.roundToNearestPixel(0.4);
 if (hairlineWidth === 0) {
   hairlineWidth = 1 / PixelRatio.get();
 }
 
-const absoluteFillObject = {
-  position: ('absolute': 'absolute'),
+const absoluteFillObject: LayoutStyle = {
+  position: 'absolute',
   left: 0,
   right: 0,
   top: 0,
   bottom: 0,
 };
-const absoluteFill: typeof absoluteFillObject =
-  ReactNativePropRegistry.register(absoluteFillObject); // This also freezes it
+const absoluteFill: StyleSheetInternalStyleIdentifier = ReactNativePropRegistry.register(
+  absoluteFillObject,
+); // This also freezes it
 
 /**
  * A StyleSheet is an abstraction similar to CSS StyleSheets
@@ -140,11 +141,14 @@ module.exports = {
    * array, saving allocations and maintaining reference equality for
    * PureComponent checks.
    */
-  compose(style1: ?StyleProp, style2: ?StyleProp): ?StyleProp {
-    if (style1 && style2) {
+  compose(
+    style1: ?DangerouslyImpreciseStyleProp,
+    style2: ?DangerouslyImpreciseStyleProp,
+  ): ?DangerouslyImpreciseStyleProp {
+    if (style1 != null && style2 != null) {
       return [style1, style2];
     } else {
-      return style1 || style2;
+      return style1 != null ? style1 : style2;
     }
   },
 
@@ -198,7 +202,10 @@ module.exports = {
    * internally to process color and transform values. You should not use this
    * unless you really know what you are doing and have exhausted other options.
    */
-  setStyleAttributePreprocessor(property: string, process: (nextProp: mixed) => mixed) {
+  setStyleAttributePreprocessor(
+    property: string,
+    process: (nextProp: mixed) => mixed,
+  ) {
     let value;
 
     if (typeof ReactNativeStyleAttributes[property] === 'string') {
@@ -214,13 +221,15 @@ module.exports = {
       console.warn(`Overwriting ${property} style attribute preprocessor`);
     }
 
-    ReactNativeStyleAttributes[property] = { ...value, process };
+    ReactNativeStyleAttributes[property] = {...value, process};
   },
 
   /**
    * Creates a StyleSheet style reference from the given object.
    */
-  create<S: Styles>(obj: S): StyleSheet<S> {
+  create<+S: ____Styles_Internal>(
+    obj: S,
+  ): $ObjMap<S, (Object) => StyleSheetInternalStyleIdentifier> {
     const result = {};
     for (const key in obj) {
       StyleSheetValidation.validateStyle(key, obj);
diff --git a/Libraries/StyleSheet/StyleSheetPropType.js b/Libraries/StyleSheet/StyleSheetPropType.js
index 5bea428c2e62ba..ac779f915393c8 100644
--- a/Libraries/StyleSheet/StyleSheetPropType.js
+++ b/Libraries/StyleSheet/StyleSheetPropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StyleSheetPropType
  * @flow
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index 73fb354435fb1a..b9c3c59fd2d345 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StyleSheetTypes
  * @flow
@@ -15,158 +13,160 @@
 
 import AnimatedNode from 'AnimatedNode';
 
-export opaque type StyleSheetStyle: number = number;
+export opaque type ____StyleSheetInternalStyleIdentifier_Internal: number = number;
 
 export type ColorValue = null | string;
 export type DimensionValue = null | number | string | AnimatedNode;
 
-export type LayoutStyle<+Dimension = DimensionValue> = {
-  +display?: 'none' | 'flex',
-  +width?: Dimension,
-  +height?: Dimension,
-  +bottom?: Dimension,
-  +end?: Dimension,
-  +left?: Dimension,
-  +right?: Dimension,
-  +start?: Dimension,
-  +top?: Dimension,
-  +minWidth?: Dimension,
-  +maxWidth?: Dimension,
-  +minHeight?: Dimension,
-  +maxHeight?: Dimension,
-  +margin?: Dimension,
-  +marginBottom?: Dimension,
-  +marginEnd?: Dimension,
-  +marginHorizontal?: Dimension,
-  +marginLeft?: Dimension,
-  +marginRight?: Dimension,
-  +marginStart?: Dimension,
-  +marginTop?: Dimension,
-  +marginVertical?: Dimension,
-  +padding?: Dimension,
-  +paddingBottom?: Dimension,
-  +paddingEnd?: Dimension,
-  +paddingHorizontal?: Dimension,
-  +paddingLeft?: Dimension,
-  +paddingRight?: Dimension,
-  +paddingStart?: Dimension,
-  +paddingTop?: Dimension,
-  +paddingVertical?: Dimension,
-  +borderWidth?: number,
-  +borderBottomWidth?: number,
-  +borderEndWidth?: number,
-  +borderLeftWidth?: number,
-  +borderRightWidth?: number,
-  +borderStartWidth?: number,
-  +borderTopWidth?: number,
-  +position?: 'absolute' | 'relative',
-  +flexDirection?: 'row' | 'row-reverse' | 'column' | 'column-reverse',
-  +flexWrap?: 'wrap' | 'nowrap',
-  +justifyContent?:
+export type LayoutStyle = $ReadOnly<{|
+  display?: 'none' | 'flex',
+  width?: DimensionValue,
+  height?: DimensionValue,
+  bottom?: DimensionValue,
+  end?: DimensionValue,
+  left?: DimensionValue,
+  right?: DimensionValue,
+  start?: DimensionValue,
+  top?: DimensionValue,
+  minWidth?: DimensionValue,
+  maxWidth?: DimensionValue,
+  minHeight?: DimensionValue,
+  maxHeight?: DimensionValue,
+  margin?: DimensionValue,
+  marginBottom?: DimensionValue,
+  marginEnd?: DimensionValue,
+  marginHorizontal?: DimensionValue,
+  marginLeft?: DimensionValue,
+  marginRight?: DimensionValue,
+  marginStart?: DimensionValue,
+  marginTop?: DimensionValue,
+  marginVertical?: DimensionValue,
+  padding?: DimensionValue,
+  paddingBottom?: DimensionValue,
+  paddingEnd?: DimensionValue,
+  paddingHorizontal?: DimensionValue,
+  paddingLeft?: DimensionValue,
+  paddingRight?: DimensionValue,
+  paddingStart?: DimensionValue,
+  paddingTop?: DimensionValue,
+  paddingVertical?: DimensionValue,
+  borderWidth?: number,
+  borderBottomWidth?: number,
+  borderEndWidth?: number,
+  borderLeftWidth?: number,
+  borderRightWidth?: number,
+  borderStartWidth?: number,
+  borderTopWidth?: number,
+  position?: 'absolute' | 'relative',
+  flexDirection?: 'row' | 'row-reverse' | 'column' | 'column-reverse',
+  flexWrap?: 'wrap' | 'nowrap',
+  justifyContent?:
     | 'flex-start'
     | 'flex-end'
     | 'center'
     | 'space-between'
     | 'space-around'
     | 'space-evenly',
-  +alignItems?: 'flex-start' | 'flex-end' | 'center' | 'stretch' | 'baseline',
-  +alignSelf?:
+  alignItems?: 'flex-start' | 'flex-end' | 'center' | 'stretch' | 'baseline',
+  alignSelf?:
     | 'auto'
     | 'flex-start'
     | 'flex-end'
     | 'center'
     | 'stretch'
     | 'baseline',
-  +alignContent?:
+  alignContent?:
     | 'flex-start'
     | 'flex-end'
     | 'center'
     | 'stretch'
     | 'space-between'
     | 'space-around',
-  +overflow?: 'visible' | 'hidden' | 'scroll',
-  +flex?: number,
-  +flexGrow?: number,
-  +flexShrink?: number,
-  +flexBasis?: number | string,
-  +aspectRatio?: number,
-  +zIndex?: number,
-  +direction?: 'inherit' | 'ltr' | 'rtl',
-};
+  overflow?: 'visible' | 'hidden' | 'scroll',
+  flex?: number,
+  flexGrow?: number,
+  flexShrink?: number,
+  flexBasis?: number | string,
+  aspectRatio?: number,
+  zIndex?: number,
+  direction?: 'inherit' | 'ltr' | 'rtl',
+|}>;
 
-export type TransformStyle = {
-  +transform?: $ReadOnlyArray<
-    | {+perspective: number | AnimatedNode}
-    | {+rotate: string}
-    | {+rotateX: string}
-    | {+rotateY: string}
-    | {+rotateZ: string}
-    | {+scale: number | AnimatedNode}
-    | {+scaleX: number | AnimatedNode}
-    | {+scaleY: number | AnimatedNode}
-    | {+translateX: number | AnimatedNode}
-    | {+translateY: number | AnimatedNode}
-    | {
+export type TransformStyle = $ReadOnly<{|
+  transform?: $ReadOnlyArray<
+    | {|+perspective: number | AnimatedNode|}
+    | {|+rotate: string|}
+    | {|+rotateX: string|}
+    | {|+rotateY: string|}
+    | {|+rotateZ: string|}
+    | {|+scale: number | AnimatedNode|}
+    | {|+scaleX: number | AnimatedNode|}
+    | {|+scaleY: number | AnimatedNode|}
+    | {|+translateX: number | AnimatedNode|}
+    | {|+translateY: number | AnimatedNode|}
+    | {|
       +translate: [number | AnimatedNode, number | AnimatedNode] | AnimatedNode,
-    }
-    | {+skewX: string}
-    | {+skewY: string}
+    |}
+    | {|+skewX: string|}
+    | {|+skewY: string|}
     // TODO: what is the actual type it expects?
-    | {+matrix: $ReadOnlyArray<number | AnimatedNode> | AnimatedNode},
+    | {|
+      +matrix: $ReadOnlyArray<number | AnimatedNode> | AnimatedNode,
+    |},
   >,
-};
+|}>;
 
-export type ShadowStyle<+Color = ColorValue> = {
-  +shadowColor?: Color,
-  +shadowOffset?: {
-    +width?: number,
-    +height?: number,
-  },
-  +shadowOpacity?: number | AnimatedNode,
-  +shadowRadius?: number,
-};
+export type ShadowStyle = $ReadOnly<{|
+  shadowColor?: ColorValue,
+  shadowOffset?: $ReadOnly<{|
+    width?: number,
+    height?: number,
+  |}>,
+  shadowOpacity?: number | AnimatedNode,
+  shadowRadius?: number,
+|}>;
 
-export type ViewStyle<+Dimension = DimensionValue, +Color = ColorValue> = {
-  ...$Exact<LayoutStyle<Dimension>>,
-  ...$Exact<ShadowStyle<Color>>,
+export type ViewStyle = $ReadOnly<{|
+  ...$Exact<LayoutStyle>,
+  ...$Exact<ShadowStyle>,
   ...$Exact<TransformStyle>,
-  +backfaceVisibility?: 'visible' | 'hidden',
-  +backgroundColor?: Color,
-  +borderColor?: Color,
-  +borderBottomColor?: Color,
-  +borderEndColor?: Color,
-  +borderLeftColor?: Color,
-  +borderRightColor?: Color,
-  +borderStartColor?: Color,
-  +borderTopColor?: Color,
-  +borderRadius?: number,
-  +borderBottomEndRadius?: number,
-  +borderBottomLeftRadius?: number,
-  +borderBottomRightRadius?: number,
-  +borderBottomStartRadius?: number,
-  +borderTopEndRadius?: number,
-  +borderTopLeftRadius?: number,
-  +borderTopRightRadius?: number,
-  +borderTopStartRadius?: number,
-  +borderStyle?: 'solid' | 'dotted' | 'dashed',
-  +borderWidth?: number,
-  +borderBottomWidth?: number,
-  +borderEndWidth?: number,
-  +borderLeftWidth?: number,
-  +borderRightWidth?: number,
-  +borderStartWidth?: number,
-  +borderTopWidth?: number,
-  +opacity?: number | AnimatedNode,
-  +elevation?: number,
-};
+  backfaceVisibility?: 'visible' | 'hidden',
+  backgroundColor?: ColorValue,
+  borderColor?: ColorValue,
+  borderBottomColor?: ColorValue,
+  borderEndColor?: ColorValue,
+  borderLeftColor?: ColorValue,
+  borderRightColor?: ColorValue,
+  borderStartColor?: ColorValue,
+  borderTopColor?: ColorValue,
+  borderRadius?: number,
+  borderBottomEndRadius?: number,
+  borderBottomLeftRadius?: number,
+  borderBottomRightRadius?: number,
+  borderBottomStartRadius?: number,
+  borderTopEndRadius?: number,
+  borderTopLeftRadius?: number,
+  borderTopRightRadius?: number,
+  borderTopStartRadius?: number,
+  borderStyle?: 'solid' | 'dotted' | 'dashed',
+  borderWidth?: number,
+  borderBottomWidth?: number,
+  borderEndWidth?: number,
+  borderLeftWidth?: number,
+  borderRightWidth?: number,
+  borderStartWidth?: number,
+  borderTopWidth?: number,
+  opacity?: number | AnimatedNode,
+  elevation?: number,
+|}>;
 
-export type TextStyle<+Dimension = DimensionValue, +Color = ColorValue> = {
-  ...$Exact<ViewStyle<Dimension, Color>>,
-  +color?: Color,
-  +fontFamily?: string,
-  +fontSize?: number,
-  +fontStyle?: 'normal' | 'italic',
-  +fontWeight?:
+export type TextStyle = $ReadOnly<{|
+  ...$Exact<ViewStyle>,
+  color?: ColorValue,
+  fontFamily?: string,
+  fontSize?: number,
+  fontStyle?: 'normal' | 'italic',
+  fontWeight?:
     | 'normal'
     | 'bold'
     | '100'
@@ -178,74 +178,74 @@ export type TextStyle<+Dimension = DimensionValue, +Color = ColorValue> = {
     | '700'
     | '800'
     | '900',
-  +fontVariant?: $ReadOnlyArray<
+  fontVariant?: $ReadOnlyArray<
     | 'small-caps'
     | 'oldstyle-nums'
     | 'lining-nums'
     | 'tabular-nums'
     | 'proportional-nums',
   >,
-  +textShadowOffset?: {+width?: number, +height?: number},
-  +textShadowRadius?: number,
-  +textShadowColor?: Color,
-  +letterSpacing?: number,
-  +lineHeight?: number,
-  +textAlign?: 'auto' | 'left' | 'right' | 'center' | 'justify',
-  +textAlignVertical?: 'auto' | 'top' | 'bottom' | 'center',
-  +includeFontPadding?: boolean,
-  +textDecorationLine?:
+  textShadowOffset?: $ReadOnly<{|
+    width?: number,
+    height?: number,
+  |}>,
+  textShadowRadius?: number,
+  textShadowColor?: ColorValue,
+  letterSpacing?: number,
+  lineHeight?: number,
+  textAlign?: 'auto' | 'left' | 'right' | 'center' | 'justify',
+  textAlignVertical?: 'auto' | 'top' | 'bottom' | 'center',
+  includeFontPadding?: boolean,
+  textDecorationLine?:
     | 'none'
     | 'underline'
     | 'line-through'
     | 'underline line-through',
-  +textDecorationStyle?: 'solid' | 'double' | 'dotted' | 'dashed',
-  +textDecorationColor?: Color,
-  +writingDirection?: 'auto' | 'ltr' | 'rtl',
-};
+  textDecorationStyle?: 'solid' | 'double' | 'dotted' | 'dashed',
+  textDecorationColor?: ColorValue,
+  writingDirection?: 'auto' | 'ltr' | 'rtl',
+|}>;
 
-export type ImageStyle<+Dimension = DimensionValue, +Color = ColorValue> = {
-  ...$Exact<ViewStyle<Dimension, Color>>,
-  +resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat',
-  +tintColor?: Color,
-  +overlayColor?: string,
-};
+export type ImageStyle = $ReadOnly<{|
+  ...$Exact<ViewStyle>,
+  resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat',
+  tintColor?: ColorValue,
+  overlayColor?: string,
+|}>;
 
-export type Style<+Dimension = DimensionValue, +Color = ColorValue> = {
-  ...$Exact<TextStyle<Dimension, Color>>,
+export type DangerouslyImpreciseStyle = {
+  ...$Exact<TextStyle>,
   +resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat',
-  +tintColor?: Color,
+  +tintColor?: ColorValue,
   +overlayColor?: string,
 };
 
-export type StyleProp<+T> =
+type GenericStyleProp<+T> =
   | null
   | void
   | T
-  | StyleSheetStyle
+  | ____StyleSheetInternalStyleIdentifier_Internal
   | number
   | false
   | ''
-  | $ReadOnlyArray<StyleProp<T>>;
-
-// export type ViewStyleProp = StyleProp<$Shape<ViewStyle<DimensionValue>>>;
-// export type TextStyleProp = StyleProp<
-//   $Shape<TextStyle<DimensionValue, ColorValue>>,
-// >;
-// export type ImageStyleProp = StyleProp<
-//   $Shape<ImageStyle<DimensionValue, ColorValue>>,
-// >;
-
-export type StyleObj = StyleProp<$Shape<Style<DimensionValue, ColorValue>>>;
-export type StyleValue = StyleObj;
+  | $ReadOnlyArray<GenericStyleProp<T>>;
 
-export type ViewStyleProp = StyleObj;
-export type TextStyleProp = StyleObj;
-export type ImageStyleProp = StyleObj;
+export type ____DangerouslyImpreciseStyleProp_Internal = GenericStyleProp<
+  $Shape<DangerouslyImpreciseStyle>,
+>;
+export type ____ViewStyleProp_Internal = GenericStyleProp<
+  $ReadOnly<$Shape<ViewStyle>>,
+>;
+export type ____TextStyleProp_Internal = GenericStyleProp<
+  $ReadOnly<$Shape<TextStyle>>,
+>;
+export type ____ImageStyleProp_Internal = GenericStyleProp<
+  $ReadOnly<$Shape<ImageStyle>>,
+>;
 
-export type Styles = {
-  +[key: string]: $Shape<Style<DimensionValue, ColorValue>>,
+export type ____Styles_Internal = {
+  +[key: string]: $Shape<DangerouslyImpreciseStyle>,
 };
-export type StyleSheet<+S: Styles> = $ObjMap<S, (Object) => StyleSheetStyle>;
 
 /*
 Utility type get non-nullable types for specific style keys.
@@ -262,4 +262,6 @@ type Props = {position: TypeForStyleKey<'position'>};
 This will correctly give you the type 'absolute' | 'relative' instead of the
 weak type of just string;
 */
-export type TypeForStyleKey<+key: $Keys<Style<>>> = $ElementType<Style<>, key>;
+export type TypeForStyleKey<
+  +key: $Keys<DangerouslyImpreciseStyle>,
+> = $ElementType<DangerouslyImpreciseStyle, key>;
diff --git a/Libraries/StyleSheet/StyleSheetValidation.js b/Libraries/StyleSheet/StyleSheetValidation.js
index a1f63aa037e9a9..3e1af7bc1dd2f7 100644
--- a/Libraries/StyleSheet/StyleSheetValidation.js
+++ b/Libraries/StyleSheet/StyleSheetValidation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StyleSheetValidation
  * @flow
diff --git a/Libraries/StyleSheet/TransformPropTypes.js b/Libraries/StyleSheet/TransformPropTypes.js
index da3e39e56c805f..bd1f3d352e116d 100644
--- a/Libraries/StyleSheet/TransformPropTypes.js
+++ b/Libraries/StyleSheet/TransformPropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TransformPropTypes
  * @flow
diff --git a/Libraries/StyleSheet/__tests__/flattenStyle-test.js b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
index 316737424e76bf..2f0fdcc0fb0ab5 100644
--- a/Libraries/StyleSheet/__tests__/flattenStyle-test.js
+++ b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
@@ -1,39 +1,55 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
 'use strict';
 
-var flattenStyle = require('flattenStyle');
+const StyleSheet = require('StyleSheet');
+const StyleSheetValidation = require('StyleSheetValidation');
+const flattenStyle = require('flattenStyle');
 
-describe('flattenStyle', () => {
+function getFixture() {
+  StyleSheetValidation.addValidStylePropTypes({
+    styleA: () => {},
+    styleB: () => {},
+  });
+
+  return StyleSheet.create({
+    elementA: {
+      styleA: 'moduleA/elementA/styleA',
+      styleB: 'moduleA/elementA/styleB',
+    },
+    elementB: {
+      styleB: 'moduleA/elementB/styleB',
+    },
+  });
+}
 
+describe('flattenStyle', () => {
   it('should merge style objects', () => {
-    var style1 = {width: 10};
-    var style2 = {height: 20};
-    var flatStyle = flattenStyle([style1, style2]);
+    const style1 = {width: 10};
+    const style2 = {height: 20};
+    const flatStyle = flattenStyle([style1, style2]);
     expect(flatStyle.width).toBe(10);
     expect(flatStyle.height).toBe(20);
   });
 
   it('should override style properties', () => {
-    var style1 = {backgroundColor: '#000', width: 10};
-    var style2 = {backgroundColor: '#023c69', width: null};
-    var flatStyle = flattenStyle([style1, style2]);
+    const style1 = {backgroundColor: '#000', width: 10};
+    const style2 = {backgroundColor: '#023c69', width: null};
+    const flatStyle = flattenStyle([style1, style2]);
     expect(flatStyle.backgroundColor).toBe('#023c69');
     expect(flatStyle.width).toBe(null);
   });
 
   it('should overwrite properties with `undefined`', () => {
-    var style1 = {backgroundColor: '#000'};
-    var style2 = {backgroundColor: undefined};
-    var flatStyle = flattenStyle([style1, style2]);
+    const style1 = {backgroundColor: '#000'};
+    const style2 = {backgroundColor: undefined};
+    const flatStyle = flattenStyle([style1, style2]);
     expect(flatStyle.backgroundColor).toBe(undefined);
   });
 
@@ -42,11 +58,99 @@ describe('flattenStyle', () => {
   });
 
   it('should recursively flatten arrays', () => {
-    var style1 = {width: 10};
-    var style2 = {height: 20};
-    var style3 = {width: 30};
-    var flatStyle = flattenStyle([null, [], [style1, style2], style3]);
+    const style1 = {width: 10};
+    const style2 = {height: 20};
+    const style3 = {width: 30};
+    const flatStyle = flattenStyle([null, [], [style1, style2], style3]);
     expect(flatStyle.width).toBe(30);
     expect(flatStyle.height).toBe(20);
   });
+
+  it('should not allocate an object when there is no style', () => {
+    const nullStyle = flattenStyle(null);
+    const nullStyleAgain = flattenStyle(null);
+
+    expect(nullStyle).toBe(nullStyleAgain);
+    expect(nullStyle).toBe(undefined);
+  });
+
+  it('should not allocate an object when there is a style', () => {
+    const style = {a: 'b'};
+    const nullStyle = flattenStyle(style);
+
+    expect(nullStyle).toBe(style);
+  });
+
+  it('should not allocate an object when there is a single class', () => {
+    const fixture = getFixture();
+    var singleStyle = flattenStyle(fixture.elementA);
+    var singleStyleAgain = flattenStyle(fixture.elementA);
+
+    expect(singleStyle).toBe(singleStyleAgain);
+    expect(singleStyle).toEqual({
+      styleA: 'moduleA/elementA/styleA',
+      styleB: 'moduleA/elementA/styleB',
+    });
+  });
+
+  it('should merge single class and style properly', () => {
+    const fixture = getFixture();
+    var style = {styleA: 'overrideA', styleC: 'overrideC'};
+    var arrayStyle = flattenStyle([fixture.elementA, style]);
+
+    expect(arrayStyle).toEqual({
+      styleA: 'overrideA',
+      styleB: 'moduleA/elementA/styleB',
+      styleC: 'overrideC',
+    });
+  });
+
+  it('should merge multiple classes', () => {
+    const fixture = getFixture();
+    var AthenB = flattenStyle([fixture.elementA, fixture.elementB]);
+    var BthenA = flattenStyle([fixture.elementB, fixture.elementA]);
+
+    expect(AthenB).toEqual({
+      styleA: 'moduleA/elementA/styleA',
+      styleB: 'moduleA/elementB/styleB',
+    });
+    expect(BthenA).toEqual({
+      styleA: 'moduleA/elementA/styleA',
+      styleB: 'moduleA/elementA/styleB',
+    });
+  });
+
+  it('should merge multiple classes with style', () => {
+    const fixture = getFixture();
+    var style = {styleA: 'overrideA'};
+    var AthenB = flattenStyle([fixture.elementA, fixture.elementB, style]);
+    var BthenA = flattenStyle([fixture.elementB, fixture.elementA, style]);
+
+    expect(AthenB).toEqual({
+      styleA: 'overrideA',
+      styleB: 'moduleA/elementB/styleB',
+    });
+    expect(BthenA).toEqual({
+      styleA: 'overrideA',
+      styleB: 'moduleA/elementA/styleB',
+    });
+  });
+
+  it('should flatten recursively', () => {
+    const fixture = getFixture();
+    var style = [{styleA: 'newA', styleB: 'newB'}, {styleA: 'newA2'}];
+    var AthenB = flattenStyle([fixture.elementA, fixture.elementB, style]);
+
+    expect(AthenB).toEqual({
+      styleA: 'newA2',
+      styleB: 'newB',
+    });
+  });
+
+  it('should ignore invalid class names', () => {
+    var invalid = flattenStyle(1234, null);
+
+    expect(invalid).toEqual({});
+    // Invalid class name 1234 skipping ...
+  });
 });
diff --git a/Libraries/StyleSheet/__tests__/normalizeColor-test.js b/Libraries/StyleSheet/__tests__/normalizeColor-test.js
index 65eee3facc80cb..d7482a9c55bd55 100644
--- a/Libraries/StyleSheet/__tests__/normalizeColor-test.js
+++ b/Libraries/StyleSheet/__tests__/normalizeColor-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/StyleSheet/__tests__/processColor-test.js b/Libraries/StyleSheet/__tests__/processColor-test.js
index 48f7be3ca08209..2af0baa108a742 100644
--- a/Libraries/StyleSheet/__tests__/processColor-test.js
+++ b/Libraries/StyleSheet/__tests__/processColor-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/StyleSheet/__tests__/processTransform-test.js b/Libraries/StyleSheet/__tests__/processTransform-test.js
index bd2317dba4d7e9..2a5c9380a370b6 100644
--- a/Libraries/StyleSheet/__tests__/processTransform-test.js
+++ b/Libraries/StyleSheet/__tests__/processTransform-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
index 7057cf70453607..13e47aff565726 100644
--- a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
+++ b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js
index f0998626979d77..37ac2d434a0fb4 100644
--- a/Libraries/StyleSheet/flattenStyle.js
+++ b/Libraries/StyleSheet/flattenStyle.js
@@ -1,20 +1,19 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule flattenStyle
  * @flow
+ * @format
  */
 'use strict';
 
-var invariant = require('fbjs/lib/invariant');
 var ReactNativePropRegistry;
 
-import type { StyleObj } from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
+import type {DangerouslyImpreciseStyle} from 'StyleSheetTypes';
 
 function getStyle(style) {
   if (ReactNativePropRegistry === undefined) {
@@ -26,11 +25,12 @@ function getStyle(style) {
   return style;
 }
 
-function flattenStyle(style: ?StyleObj): ?Object {
-  if (!style) {
+function flattenStyle(
+  style: ?DangerouslyImpreciseStyleProp,
+): ?DangerouslyImpreciseStyle {
+  if (style == null) {
     return undefined;
   }
-  invariant(style !== true, 'style may be false but not true');
 
   if (!Array.isArray(style)) {
     /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an
diff --git a/Libraries/StyleSheet/normalizeColor.js b/Libraries/StyleSheet/normalizeColor.js
index d4f0252b5ac88a..09c2e1525d5473 100755
--- a/Libraries/StyleSheet/normalizeColor.js
+++ b/Libraries/StyleSheet/normalizeColor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule normalizeColor
  * @flow
diff --git a/Libraries/StyleSheet/processColor.js b/Libraries/StyleSheet/processColor.js
index b4b471432334ae..7d3a802bbbe3c2 100644
--- a/Libraries/StyleSheet/processColor.js
+++ b/Libraries/StyleSheet/processColor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule processColor
  * @flow
diff --git a/Libraries/StyleSheet/processTransform.js b/Libraries/StyleSheet/processTransform.js
index eed0f16caa2aa7..09cc7ca95d18c0 100644
--- a/Libraries/StyleSheet/processTransform.js
+++ b/Libraries/StyleSheet/processTransform.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule processTransform
  * @flow
diff --git a/Libraries/StyleSheet/setNormalizedColorAlpha.js b/Libraries/StyleSheet/setNormalizedColorAlpha.js
index cd943309922c0e..309d86cea12e80 100644
--- a/Libraries/StyleSheet/setNormalizedColorAlpha.js
+++ b/Libraries/StyleSheet/setNormalizedColorAlpha.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule setNormalizedColorAlpha
  * @flow
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h
index 49017bda5bdc92..99e89e56ad95c9 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <ComponentKit/CKComponent.h>
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
index d2875f2136f3f6..6cbdbd8a99716c 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceBackedComponent.h"
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
index 819d927d0ea444..c2bfbc81bf095a 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm
index 25d1819a552aac..60a72cb0ad25be 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceBackedComponentState.h"
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h
index 184ff32a9342c6..269c73e79eccbe 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <RCTSurfaceHostingComponent/RCTSurfaceHostingComponent.h>
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h
index c1dd823afb5bb7..975a72bbc64e68 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <ComponentKit/CKComponent.h>
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
index 2d2a2cc10f0b63..963813ff80eedf 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceHostingComponent.h"
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h
index 04b8fcafa308c8..7937090ab225cd 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <ComponentKit/CKComponentController.h>
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
index c44dbcd007e162..73ba8e3767da55 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceHostingComponentController.h"
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
index 001cbd84e1f7a7..5c9946eb350af1 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
index b1279aaa595322..2759fdd9fcdbeb 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
index f5573db67fc50f..c2e44c9db345ff 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceHostingComponentState.h"
diff --git a/Libraries/Text/BaseText/RCTBaseTextShadowView.h b/Libraries/Text/BaseText/RCTBaseTextShadowView.h
index 736eed8ac0b950..331d1ca2161e3f 100644
--- a/Libraries/Text/BaseText/RCTBaseTextShadowView.h
+++ b/Libraries/Text/BaseText/RCTBaseTextShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/Libraries/Text/BaseText/RCTBaseTextShadowView.m b/Libraries/Text/BaseText/RCTBaseTextShadowView.m
index efafad36de0959..85162926eb198b 100644
--- a/Libraries/Text/BaseText/RCTBaseTextShadowView.m
+++ b/Libraries/Text/BaseText/RCTBaseTextShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextShadowView.h"
diff --git a/Libraries/Text/BaseText/RCTBaseTextViewManager.h b/Libraries/Text/BaseText/RCTBaseTextViewManager.h
index da73cf07083fe9..b6c105e3759f54 100644
--- a/Libraries/Text/BaseText/RCTBaseTextViewManager.h
+++ b/Libraries/Text/BaseText/RCTBaseTextViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/Text/BaseText/RCTBaseTextViewManager.m b/Libraries/Text/BaseText/RCTBaseTextViewManager.m
index 89640c7e9a68bc..a5d0b2c630975c 100644
--- a/Libraries/Text/BaseText/RCTBaseTextViewManager.m
+++ b/Libraries/Text/BaseText/RCTBaseTextViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextViewManager.h"
diff --git a/Libraries/Text/RCTConvert+Text.h b/Libraries/Text/RCTConvert+Text.h
index f48a794a2b2a54..4cead0948ab73c 100644
--- a/Libraries/Text/RCTConvert+Text.h
+++ b/Libraries/Text/RCTConvert+Text.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/Libraries/Text/RCTConvert+Text.m b/Libraries/Text/RCTConvert+Text.m
index 5e4815b1e70eba..d4d1b167c8797c 100644
--- a/Libraries/Text/RCTConvert+Text.m
+++ b/Libraries/Text/RCTConvert+Text.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert+Text.h"
diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
index a79fd942326734..da27ece2a1b138 100644
--- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj
+++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
@@ -103,6 +103,9 @@
 		5956B1A6200FF35C008D9D16 /* RCTUITextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B103200FEBA9008D9D16 /* RCTUITextField.m */; };
 		5956B1A7200FF35C008D9D16 /* RCTVirtualTextShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B12E200FEBAA008D9D16 /* RCTVirtualTextShadowView.m */; };
 		5956B1A8200FF35C008D9D16 /* RCTVirtualTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B12B200FEBAA008D9D16 /* RCTVirtualTextViewManager.m */; };
+		8F2807C7202D2B6B005D65E6 /* RCTInputAccessoryViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C1202D2B6A005D65E6 /* RCTInputAccessoryViewManager.m */; };
+		8F2807C8202D2B6B005D65E6 /* RCTInputAccessoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C3202D2B6A005D65E6 /* RCTInputAccessoryView.m */; };
+		8F2807C9202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -229,6 +232,12 @@
 		5956B12D200FEBAA008D9D16 /* RCTVirtualTextViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTVirtualTextViewManager.h; sourceTree = "<group>"; };
 		5956B12E200FEBAA008D9D16 /* RCTVirtualTextShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVirtualTextShadowView.m; sourceTree = "<group>"; };
 		5956B12F200FEBAA008D9D16 /* RCTConvert+Text.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+Text.m"; sourceTree = "<group>"; };
+		8F2807C1202D2B6A005D65E6 /* RCTInputAccessoryViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTInputAccessoryViewManager.m; sourceTree = "<group>"; };
+		8F2807C2202D2B6A005D65E6 /* RCTInputAccessoryViewContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInputAccessoryViewContent.h; sourceTree = "<group>"; };
+		8F2807C3202D2B6A005D65E6 /* RCTInputAccessoryView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTInputAccessoryView.m; sourceTree = "<group>"; };
+		8F2807C4202D2B6A005D65E6 /* RCTInputAccessoryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInputAccessoryView.h; sourceTree = "<group>"; };
+		8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTInputAccessoryViewContent.m; sourceTree = "<group>"; };
+		8F2807C6202D2B6B005D65E6 /* RCTInputAccessoryViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInputAccessoryViewManager.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
@@ -274,6 +283,12 @@
 		5956B0FF200FEBA9008D9D16 /* TextInput */ = {
 			isa = PBXGroup;
 			children = (
+				8F2807C4202D2B6A005D65E6 /* RCTInputAccessoryView.h */,
+				8F2807C3202D2B6A005D65E6 /* RCTInputAccessoryView.m */,
+				8F2807C2202D2B6A005D65E6 /* RCTInputAccessoryViewContent.h */,
+				8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */,
+				8F2807C6202D2B6B005D65E6 /* RCTInputAccessoryViewManager.h */,
+				8F2807C1202D2B6A005D65E6 /* RCTInputAccessoryViewManager.m */,
 				5956B113200FEBA9008D9D16 /* Multiline */,
 				5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */,
 				5956B107200FEBA9008D9D16 /* RCTBackedTextInputDelegateAdapter.h */,
@@ -465,8 +480,11 @@
 				5956B140200FEBAA008D9D16 /* RCTTextShadowView.m in Sources */,
 				5956B131200FEBAA008D9D16 /* RCTRawTextViewManager.m in Sources */,
 				5956B137200FEBAA008D9D16 /* RCTBaseTextInputShadowView.m in Sources */,
+				8F2807C7202D2B6B005D65E6 /* RCTInputAccessoryViewManager.m in Sources */,
 				5956B146200FEBAA008D9D16 /* RCTConvert+Text.m in Sources */,
+				8F2807C9202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m in Sources */,
 				5956B13F200FEBAA008D9D16 /* RCTTextAttributes.m in Sources */,
+				8F2807C8202D2B6B005D65E6 /* RCTInputAccessoryView.m in Sources */,
 				5956B143200FEBAA008D9D16 /* RCTTextView.m in Sources */,
 				5956B13C200FEBAA008D9D16 /* RCTUITextView.m in Sources */,
 				5956B136200FEBAA008D9D16 /* RCTBackedTextInputDelegateAdapter.m in Sources */,
diff --git a/Libraries/Text/RCTTextAttributes.h b/Libraries/Text/RCTTextAttributes.h
index 7752c2c66b9ee0..df9171c85d0aa1 100644
--- a/Libraries/Text/RCTTextAttributes.h
+++ b/Libraries/Text/RCTTextAttributes.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/RCTTextAttributes.m b/Libraries/Text/RCTTextAttributes.m
index 26d63bdda8cd60..6427e303158bb9 100644
--- a/Libraries/Text/RCTTextAttributes.m
+++ b/Libraries/Text/RCTTextAttributes.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTextAttributes.h"
@@ -190,7 +188,7 @@ - (UIFont *)effectiveFont
 
 - (CGFloat)effectiveFontSizeMultiplier
 {
-  return _allowFontScaling && !isnan(_fontSizeMultiplier) ? _fontSizeMultiplier : 1.0;
+  return !RCTHasFontHandlerSet() && _allowFontScaling && !isnan(_fontSizeMultiplier) ? _fontSizeMultiplier : 1.0;
 }
 
 - (UIColor *)effectiveForegroundColor
diff --git a/Libraries/Text/RawText/RCTRawTextShadowView.h b/Libraries/Text/RawText/RCTRawTextShadowView.h
index 52e61f0ba90d3b..51760308ba090e 100644
--- a/Libraries/Text/RawText/RCTRawTextShadowView.h
+++ b/Libraries/Text/RawText/RCTRawTextShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/Libraries/Text/RawText/RCTRawTextShadowView.m b/Libraries/Text/RawText/RCTRawTextShadowView.m
index d350d29684c91d..12c01d1b5f6af5 100644
--- a/Libraries/Text/RawText/RCTRawTextShadowView.m
+++ b/Libraries/Text/RawText/RCTRawTextShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRawTextShadowView.h"
diff --git a/Libraries/Text/RawText/RCTRawTextViewManager.h b/Libraries/Text/RawText/RCTRawTextViewManager.h
index 38d83e385be9d3..8ff302815527e7 100644
--- a/Libraries/Text/RawText/RCTRawTextViewManager.h
+++ b/Libraries/Text/RawText/RCTRawTextViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/Text/RawText/RCTRawTextViewManager.m b/Libraries/Text/RawText/RCTRawTextViewManager.m
index 17233cdc790d33..f159f73d3b92bb 100644
--- a/Libraries/Text/RawText/RCTRawTextViewManager.m
+++ b/Libraries/Text/RawText/RCTRawTextViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRawTextViewManager.h"
diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index 110a8489fa97c6..866f46819e9bce 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Text
  * @flow
@@ -12,15 +10,10 @@
  */
 'use strict';
 
-const ColorPropType = require('ColorPropType');
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const NativeMethodsMixin = require('NativeMethodsMixin');
-const Platform = require('Platform');
 const React = require('React');
-const PropTypes = require('prop-types');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
-const StyleSheetPropType = require('StyleSheetPropType');
-const TextStylePropTypes = require('TextStylePropTypes');
+const TextPropTypes = require('TextPropTypes');
 const Touchable = require('Touchable');
 const UIManager = require('UIManager');
 
@@ -30,8 +23,6 @@ const mergeFast = require('mergeFast');
 const processColor = require('processColor');
 const {ViewContextTypes} = require('ViewContext');
 
-const stylePropType = StyleSheetPropType(TextStylePropTypes);
-
 const viewConfig = {
   validAttributes: mergeFast(ReactNativeViewAttributes.UIView, {
     isHighlighted: true,
@@ -58,113 +49,7 @@ import type {ViewChildContext} from 'ViewContext';
 
 const Text = createReactClass({
   displayName: 'Text',
-  propTypes: {
-    /**
-     * When `numberOfLines` is set, this prop defines how text will be
-     * truncated.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#ellipsizemode
-     */
-    ellipsizeMode: PropTypes.oneOf(['head', 'middle', 'tail', 'clip']),
-    /**
-     * Used to truncate the text with an ellipsis.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#numberoflines
-     */
-    numberOfLines: PropTypes.number,
-    /**
-     * Set text break strategy on Android.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#textbreakstrategy
-     */
-    textBreakStrategy: PropTypes.oneOf(['simple', 'highQuality', 'balanced']),
-    /**
-     * Invoked on mount and layout changes.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#onlayout
-     */
-    onLayout: PropTypes.func,
-    /**
-     * This function is called on press.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#onpress
-     */
-    onPress: PropTypes.func,
-    /**
-     * This function is called on long press.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#onlongpress
-     */
-    onLongPress: PropTypes.func,
-    /**
-     * Defines how far your touch may move off of the button, before
-     * deactivating the button.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#pressretentionoffset
-     */
-    pressRetentionOffset: EdgeInsetsPropType,
-    /**
-     * Lets the user select text.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#selectable
-     */
-    selectable: PropTypes.bool,
-    /**
-     * The highlight color of the text.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#selectioncolor
-     */
-    selectionColor: ColorPropType,
-    /**
-     * When `true`, no visual change is made when text is pressed down.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#supperhighlighting
-     */
-    suppressHighlighting: PropTypes.bool,
-    style: stylePropType,
-    /**
-     * Used to locate this view in end-to-end tests.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#testid
-     */
-    testID: PropTypes.string,
-    /**
-     * Used to locate this view from native code.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#nativeid
-     */
-    nativeID: PropTypes.string,
-    /**
-     * Whether fonts should scale to respect Text Size accessibility settings.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#allowfontscaling
-     */
-    allowFontScaling: PropTypes.bool,
-    /**
-     * Indicates whether the view is an accessibility element.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#accessible
-     */
-    accessible: PropTypes.bool,
-    /**
-     * Whether font should be scaled down automatically.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#adjustsfontsizetofit
-     */
-    adjustsFontSizeToFit: PropTypes.bool,
-    /**
-     * Smallest possible scale a font can reach.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#minimumfontscale
-     */
-    minimumFontScale: PropTypes.number,
-    /**
-     * Specifies the disabled state of the text view for testing purposes.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#disabled
-     */
-    disabled: PropTypes.bool,
-  },
+  propTypes: TextPropTypes,
   getDefaultProps(): Object {
     return {
       accessible: true,
diff --git a/Libraries/Text/Text/NSTextStorage+FontScaling.h b/Libraries/Text/Text/NSTextStorage+FontScaling.h
index f3ea09ab26ad0e..8372a0d2be9183 100644
--- a/Libraries/Text/Text/NSTextStorage+FontScaling.h
+++ b/Libraries/Text/Text/NSTextStorage+FontScaling.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/Text/NSTextStorage+FontScaling.m b/Libraries/Text/Text/NSTextStorage+FontScaling.m
index 4233bef9675d04..5002dddd8a425c 100644
--- a/Libraries/Text/Text/NSTextStorage+FontScaling.m
+++ b/Libraries/Text/Text/NSTextStorage+FontScaling.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "NSTextStorage+FontScaling.h"
diff --git a/Libraries/Text/Text/RCTTextShadowView.h b/Libraries/Text/Text/RCTTextShadowView.h
index 6cdd8fdd316908..d62748df8169cf 100644
--- a/Libraries/Text/Text/RCTTextShadowView.h
+++ b/Libraries/Text/Text/RCTTextShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m
index a4490388ea4a9c..1266f8afd74dd9 100644
--- a/Libraries/Text/Text/RCTTextShadowView.m
+++ b/Libraries/Text/Text/RCTTextShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTextShadowView.h"
@@ -31,6 +29,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _cachedTextStorages = [NSMapTable strongToStrongObjectsMapTable];
     _needsUpdateView = YES;
     YGNodeSetMeasureFunc(self.yogaNode, RCTTextShadowViewMeasure);
+    YGNodeSetBaselineFunc(self.yogaNode, RCTTextShadowViewBaseline);
   }
 
   return self;
@@ -235,40 +234,24 @@ - (NSTextStorage *)textStorageAndLayoutManagerThatFitsSize:(CGSize)size
   return textStorage;
 }
 
-- (void)applyLayoutNode:(YGNodeRef)node
-      viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-       absolutePosition:(CGPoint)absolutePosition
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
+            layoutContext:(RCTLayoutContext)layoutContext
 {
-  if (YGNodeGetHasNewLayout(self.yogaNode)) {
-    // If the view got new layout, we have to redraw it because `contentFrame`
-    // and sizes of embedded views may change.
+  // If the view got new `contentFrame`, we have to redraw it because
+  // and sizes of embedded views may change.
+  if (!CGRectEqualToRect(self.layoutMetrics.contentFrame, layoutMetrics.contentFrame)) {
     _needsUpdateView = YES;
   }
 
-  [super applyLayoutNode:node
-       viewsWithNewFrame:viewsWithNewFrame
-        absolutePosition:absolutePosition];
-}
-
-- (void)applyLayoutWithFrame:(CGRect)frame
-             layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
-      viewsWithUpdatedLayout:(NSMutableSet<RCTShadowView *> *)viewsWithUpdatedLayout
-            absolutePosition:(CGPoint)absolutePosition
-{
-  if (self.textAttributes.layoutDirection != layoutDirection) {
-    self.textAttributes.layoutDirection = layoutDirection;
+  if (self.textAttributes.layoutDirection != layoutMetrics.layoutDirection) {
+    self.textAttributes.layoutDirection = layoutMetrics.layoutDirection;
     [self invalidateCache];
   }
 
-  [super applyLayoutWithFrame:frame
-              layoutDirection:layoutDirection
-       viewsWithUpdatedLayout:viewsWithUpdatedLayout
-             absolutePosition:absolutePosition];
+  [super layoutWithMetrics:layoutMetrics layoutContext:layoutContext];
 }
 
-- (void)applyLayoutToChildren:(YGNodeRef)node
-            viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-             absolutePosition:(CGPoint)absolutePosition
+- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
 {
   NSTextStorage *textStorage =
     [self textStorageAndLayoutManagerThatFitsSize:self.availableSize
@@ -280,9 +263,9 @@ - (void)applyLayoutToChildren:(YGNodeRef)node
                                                      actualGlyphRange:NULL];
 
   [textStorage enumerateAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
-                                        inRange:characterRange
-                                        options:0
-                                     usingBlock:
+                          inRange:characterRange
+                          options:0
+                       usingBlock:
     ^(RCTShadowView *shadowView, NSRange range, BOOL *stop) {
       if (!shadowView) {
         return;
@@ -306,22 +289,44 @@ - (void)applyLayoutToChildren:(YGNodeRef)node
         RCTRoundPixelValue(attachmentSize.height)
       }};
 
-      UIUserInterfaceLayoutDirection layoutDirection = self.textAttributes.layoutDirection;
+      RCTLayoutContext localLayoutContext = layoutContext;
+      localLayoutContext.absolutePosition.x += frame.origin.x;
+      localLayoutContext.absolutePosition.y += frame.origin.y;
 
-      YGNodeCalculateLayout(
-        shadowView.yogaNode,
-        frame.size.width,
-        frame.size.height,
-        layoutDirection == UIUserInterfaceLayoutDirectionLeftToRight ? YGDirectionLTR : YGDirectionRTL);
+      [shadowView layoutWithMinimumSize:frame.size
+                            maximumSize:frame.size
+                        layoutDirection:self.layoutMetrics.layoutDirection
+                          layoutContext:localLayoutContext];
 
-      [shadowView applyLayoutWithFrame:frame
-                       layoutDirection:layoutDirection
-                viewsWithUpdatedLayout:viewsWithNewFrame
-                      absolutePosition:absolutePosition];
+      // Reinforcing a proper frame origin for the Shadow View.
+      RCTLayoutMetrics localLayoutMetrics = shadowView.layoutMetrics;
+      localLayoutMetrics.frame.origin = frame.origin;
+      [shadowView layoutWithMetrics:localLayoutMetrics layoutContext:localLayoutContext];
     }
   ];
 }
 
+- (CGFloat)lastBaselineForSize:(CGSize)size
+{
+  NSAttributedString *attributedText =
+    [self textStorageAndLayoutManagerThatFitsSize:size exclusiveOwnership:NO];
+
+  __block CGFloat maximumDescender = 0.0;
+
+  [attributedText enumerateAttribute:NSFontAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:
+    ^(UIFont *font, NSRange range, __unused BOOL *stop) {
+      if (maximumDescender > font.descender) {
+        maximumDescender = font.descender;
+      }
+    }
+  ];
+
+  return size.height + maximumDescender;
+}
+
 static YGSize RCTTextShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
 {
   CGSize maximumSize = (CGSize){
@@ -350,10 +355,27 @@ static YGSize RCTTextShadowViewMeasure(YGNodeRef node, float width, YGMeasureMod
     MIN(RCTCeilPixelValue(size.height), maximumSize.height)
   };
 
+  // Adding epsilon value illuminates problems with converting values from
+  // `double` to `float`, and then rounding them to pixel grid in Yoga.
+  CGFloat epsilon = 0.001;
   return (YGSize){
-    RCTYogaFloatFromCoreGraphicsFloat(size.width),
-    RCTYogaFloatFromCoreGraphicsFloat(size.height)
+    RCTYogaFloatFromCoreGraphicsFloat(size.width + epsilon),
+    RCTYogaFloatFromCoreGraphicsFloat(size.height + epsilon)
   };
 }
 
+static float RCTTextShadowViewBaseline(YGNodeRef node, const float width, const float height)
+{
+  RCTTextShadowView *shadowTextView = (__bridge RCTTextShadowView *)YGNodeGetContext(node);
+
+  CGSize size = (CGSize){
+    RCTCoreGraphicsFloatFromYogaFloat(width),
+    RCTCoreGraphicsFloatFromYogaFloat(height)
+  };
+
+  CGFloat lastBaseline = [shadowTextView lastBaselineForSize:size];
+
+  return RCTYogaFloatFromCoreGraphicsFloat(lastBaseline);
+}
+
 @end
diff --git a/Libraries/Text/Text/RCTTextView.h b/Libraries/Text/Text/RCTTextView.h
index c8ba22adcbcc31..b8923b1ef5fa4e 100644
--- a/Libraries/Text/Text/RCTTextView.h
+++ b/Libraries/Text/Text/RCTTextView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/Text/RCTTextView.m b/Libraries/Text/Text/RCTTextView.m
index d065e8073a3c50..45c09313909d51 100644
--- a/Libraries/Text/Text/RCTTextView.m
+++ b/Libraries/Text/Text/RCTTextView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTextView.h"
diff --git a/Libraries/Text/Text/RCTTextViewManager.h b/Libraries/Text/Text/RCTTextViewManager.h
index 957c88d477bf39..d11e4b5919d066 100644
--- a/Libraries/Text/Text/RCTTextViewManager.h
+++ b/Libraries/Text/Text/RCTTextViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/Text/Text/RCTTextViewManager.m b/Libraries/Text/Text/RCTTextViewManager.m
index 58b559de18e512..a729e644898286 100644
--- a/Libraries/Text/Text/RCTTextViewManager.m
+++ b/Libraries/Text/Text/RCTTextViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTextViewManager.h"
@@ -13,6 +11,7 @@
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTShadowView.h>
 #import <React/RCTUIManager.h>
+#import <React/RCTUIManagerUtils.h>
 #import <React/RCTUIManagerObserverCoordinator.h>
 
 #import "RCTTextShadowView.h"
@@ -83,12 +82,15 @@ - (void)handleDidUpdateMultiplierNotification
 {
   CGFloat fontSizeMultiplier = self.bridge.accessibilityManager.multiplier;
 
-  for (RCTTextShadowView *shadowView in _shadowViews) {
-    shadowView.textAttributes.fontSizeMultiplier = fontSizeMultiplier;
-    [shadowView dirtyLayout];
-  }
+  NSHashTable<RCTTextShadowView *> *shadowViews = _shadowViews;
+  RCTExecuteOnUIManagerQueue(^{
+    for (RCTTextShadowView *shadowView in shadowViews) {
+      shadowView.textAttributes.fontSizeMultiplier = fontSizeMultiplier;
+      [shadowView dirtyLayout];
+    }
 
-  [self.bridge.uiManager setNeedsLayout];
+    [self.bridge.uiManager setNeedsLayout];
+  });
 }
 
 @end
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h
index 7d280235976cf6..97466f4d455eba 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputView.h"
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
index d97c95172ecfd2..b2d3cbe894c98b 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMultilineTextInputView.h"
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h
index b2053435fc54a5..db6c62751ab828 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputViewManager.h"
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
index de84955739872d..0a2b6d5a4c9a63 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMultilineTextInputViewManager.h"
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.h b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
index c87e092ce1704c..cb817cba754039 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.h
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
@@ -25,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak) id<RCTBackedTextInputDelegate> textInputDelegate;
 
+@property (nonatomic, assign) BOOL contextMenuHidden;
 @property (nonatomic, assign, readonly) BOOL textWasPasted;
 @property (nonatomic, copy, nullable) NSString *placeholder;
 @property (nonatomic, strong, nullable) UIColor *placeholderColor;
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
index 3462b833ff5218..992a1a8abfc602 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUITextView.h"
@@ -60,19 +58,19 @@ - (void)dealloc
 - (NSString *)accessibilityLabel
 {
   NSMutableString *accessibilityLabel = [NSMutableString new];
-  
+
   NSString *superAccessibilityLabel = [super accessibilityLabel];
   if (superAccessibilityLabel.length > 0) {
     [accessibilityLabel appendString:superAccessibilityLabel];
   }
-  
+
   if (self.placeholder.length > 0 && self.attributedText.string.length == 0) {
     if (accessibilityLabel.length > 0) {
       [accessibilityLabel appendString:@" "];
     }
     [accessibilityLabel appendString:self.placeholder];
   }
-  
+
   return accessibilityLabel;
 }
 
@@ -230,6 +228,17 @@ - (CGSize)fixedSizeThatFits:(CGSize)size
   return [_detachedTextView sizeThatFits:size];
 }
 
+#pragma mark - Context Menu
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+  if (_contextMenuHidden) {
+    return NO;
+  }
+
+  return [super canPerformAction:action withSender:sender];
+}
+
 #pragma mark - Placeholder
 
 - (void)invalidatePlaceholderVisibility
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
index d124ef2ec54aa0..c580a11ead1c1f 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
index b9914c23558f37..6968313acff585 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
index 856d708f6f1709..a095c3d0f6f5a3 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBackedTextInputDelegateAdapter.h"
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h b/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
index 32a2a6ae3e65e6..d19e221064c84f 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h
index 3f1e8185b323bb..ea8abd3fdcee78 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextShadowView.h"
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
index e145d4a3b0c870..d1fdbcd3d25012 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputShadowView.h"
@@ -37,6 +35,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _needsUpdateView = YES;
 
     YGNodeSetMeasureFunc(self.yogaNode, RCTBaseTextInputShadowViewMeasure);
+    YGNodeSetBaselineFunc(self.yogaNode, RCTTextInputShadowViewBaseline);
   }
 
   return self;
@@ -47,6 +46,11 @@ - (BOOL)isYogaLeafNode
   return YES;
 }
 
+- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
+{
+  // Do nothing.
+}
+
 - (void)setLocalData:(NSObject *)localData
 {
   NSAttributedString *attributedText = (NSAttributedString *)localData;
@@ -73,7 +77,7 @@ - (void)invalidateContentSize
     return;
   }
 
-  CGSize maximumSize = self.frame.size;
+  CGSize maximumSize = self.layoutMetrics.frame.size;
 
   if (_maximumNumberOfLines == 1) {
     maximumSize.width = CGFLOAT_MAX;
@@ -162,7 +166,7 @@ - (void)uiManagerWillPerformMounting
 
 #pragma mark -
 
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
+- (NSAttributedString *)measurableAttributedText
 {
   // Only for the very first render when we don't have `_localAttributedText`,
   // we use value directly from the property and/or nested content.
@@ -182,6 +186,13 @@ - (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximu
     attributedText = [[NSAttributedString alloc] initWithString:text attributes:self.textAttributes.effectiveTextAttributes];
   }
 
+  return attributedText;
+}
+
+- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
+{
+  NSAttributedString *attributedText = [self measurableAttributedText];
+
   if (!_textStorage) {
     _textContainer = [NSTextContainer new];
     _textContainer.lineFragmentPadding = 0.0; // Note, the default value is 5.
@@ -204,6 +215,26 @@ - (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximu
   };
 }
 
+- (CGFloat)lastBaselineForSize:(CGSize)size
+{
+  NSAttributedString *attributedText = [self measurableAttributedText];
+
+  __block CGFloat maximumDescender = 0.0;
+
+  [attributedText enumerateAttribute:NSFontAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:
+    ^(UIFont *font, NSRange range, __unused BOOL *stop) {
+      if (maximumDescender > font.descender) {
+        maximumDescender = font.descender;
+      }
+    }
+  ];
+
+  return size.height + maximumDescender;
+}
+
 static YGSize RCTBaseTextInputShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
 {
   RCTShadowView *shadowView = (__bridge RCTShadowView *)YGNodeGetContext(node);
@@ -248,4 +279,18 @@ static YGSize RCTBaseTextInputShadowViewMeasure(YGNodeRef node, float width, YGM
   };
 }
 
+static float RCTTextInputShadowViewBaseline(YGNodeRef node, const float width, const float height)
+{
+  RCTBaseTextInputShadowView *shadowTextView = (__bridge RCTBaseTextInputShadowView *)YGNodeGetContext(node);
+
+  CGSize size = (CGSize){
+    RCTCoreGraphicsFloatFromYogaFloat(width),
+    RCTCoreGraphicsFloatFromYogaFloat(height)
+  };
+
+  CGFloat lastBaseline = [shadowTextView lastBaselineForSize:size];
+
+  return RCTYogaFloatFromCoreGraphicsFloat(lastBaseline);
+}
+
 @end
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.h b/Libraries/Text/TextInput/RCTBaseTextInputView.h
index 56c8d2b947d92d..6de343f2fa06d2 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
@@ -48,6 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) RCTTextSelection *selection;
 @property (nonatomic, strong, nullable) NSNumber *maxLength;
 @property (nonatomic, copy) NSAttributedString *attributedText;
+@property (nonatomic, copy) NSString *inputAccessoryViewID;
 
 @end
 
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index 177b4afccd25ea..d9c47ff16311d4 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputView.h"
@@ -17,6 +15,8 @@
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
 
+#import "RCTInputAccessoryView.h"
+#import "RCTInputAccessoryViewContent.h"
 #import "RCTTextAttributes.h"
 #import "RCTTextSelection.h"
 
@@ -402,12 +402,34 @@ - (void)didMoveToWindow
 
 - (void)didSetProps:(NSArray<NSString *> *)changedProps
 {
-  [self invalidateInputAccessoryView];
+  if ([changedProps containsObject:@"inputAccessoryViewID"] && self.inputAccessoryViewID) {
+    [self setCustomInputAccessoryViewWithNativeID:self.inputAccessoryViewID];
+  } else if (!self.inputAccessoryViewID) {
+    [self setDefaultInputAccessoryView];
+  }
+}
+
+- (void)setCustomInputAccessoryViewWithNativeID:(NSString *)nativeID
+{
+  #if !TARGET_OS_TV
+  __weak RCTBaseTextInputView *weakSelf = self;
+  [_bridge.uiManager rootViewForReactTag:self.reactTag withCompletion:^(UIView *rootView) {
+    RCTBaseTextInputView *strongSelf = weakSelf;
+    if (rootView) {
+      UIView *accessoryView = [strongSelf->_bridge.uiManager viewForNativeID:nativeID
+                                                                 withRootTag:rootView.reactTag];
+      if (accessoryView && [accessoryView isKindOfClass:[RCTInputAccessoryView class]]) {
+        strongSelf.backedTextInputView.inputAccessoryView = ((RCTInputAccessoryView *)accessoryView).content.inputAccessoryView;
+        [strongSelf reloadInputViewsIfNecessary];
+      }
+    }
+  }];
+  #endif /* !TARGET_OS_TV */
 }
 
-- (void)invalidateInputAccessoryView
+- (void)setDefaultInputAccessoryView
 {
-#if !TARGET_OS_TV
+  #if !TARGET_OS_TV
   UIView<RCTBackedTextInputViewProtocol> *textInputView = self.backedTextInputView;
   UIKeyboardType keyboardType = textInputView.keyboardType;
 
@@ -445,12 +467,16 @@ - (void)invalidateInputAccessoryView
   else {
     textInputView.inputAccessoryView = nil;
   }
+  [self reloadInputViewsIfNecessary];
+  #endif /* !TARGET_OS_TV */
+}
 
+- (void)reloadInputViewsIfNecessary
+{
   // We have to call `reloadInputViews` for focused text inputs to update an accessory view.
-  if (textInputView.isFirstResponder) {
-    [textInputView reloadInputViews];
+  if (self.backedTextInputView.isFirstResponder) {
+    [self.backedTextInputView reloadInputViews];
   }
-#endif
 }
 
 - (void)handleInputAccessoryDoneButton
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h
index 710536aaa48ee6..c370779b206610 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextViewManager.h"
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
index 7e98eda2dee47e..aaead20b0b9c1c 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputViewManager.h"
@@ -16,6 +14,7 @@
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTShadowView.h>
 #import <React/RCTUIManager.h>
+#import <React/RCTUIManagerUtils.h>
 #import <React/RCTUIManagerObserverCoordinator.h>
 
 #import "RCTBaseTextInputShadowView.h"
@@ -37,6 +36,7 @@ @implementation RCTBaseTextInputViewManager
 
 RCT_REMAP_VIEW_PROPERTY(autoCapitalize, backedTextInputView.autocapitalizationType, UITextAutocapitalizationType)
 RCT_REMAP_VIEW_PROPERTY(autoCorrect, backedTextInputView.autocorrectionType, UITextAutocorrectionType)
+RCT_REMAP_VIEW_PROPERTY(contextMenuHidden, backedTextInputView.contextMenuHidden, BOOL)
 RCT_REMAP_VIEW_PROPERTY(editable, backedTextInputView.editable, BOOL)
 RCT_REMAP_VIEW_PROPERTY(enablesReturnKeyAutomatically, backedTextInputView.enablesReturnKeyAutomatically, BOOL)
 RCT_REMAP_VIEW_PROPERTY(keyboardAppearance, backedTextInputView.keyboardAppearance, UIKeyboardAppearance)
@@ -54,6 +54,7 @@ @implementation RCTBaseTextInputViewManager
 RCT_EXPORT_VIEW_PROPERTY(maxLength, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(selectTextOnFocus, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(selection, RCTTextSelection)
+RCT_EXPORT_VIEW_PROPERTY(inputAccessoryViewID, NSString)
 
 RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onSelectionChange, RCTDirectEventBlock)
@@ -109,12 +110,15 @@ - (void)handleDidUpdateMultiplierNotification
 {
   CGFloat fontSizeMultiplier = self.bridge.accessibilityManager.multiplier;
 
-  for (RCTBaseTextInputShadowView *shadowView in _shadowViews) {
-    shadowView.textAttributes.fontSizeMultiplier = fontSizeMultiplier;
-    [shadowView dirtyLayout];
-  }
+  NSHashTable<RCTBaseTextInputShadowView *> *shadowViews = _shadowViews;
+  RCTExecuteOnUIManagerQueue(^{
+    for (RCTBaseTextInputShadowView *shadowView in shadowViews) {
+      shadowView.textAttributes.fontSizeMultiplier = fontSizeMultiplier;
+      [shadowView dirtyLayout];
+    }
 
-  [self.bridge.uiManager setNeedsLayout];
+    [self.bridge.uiManager setNeedsLayout];
+  });
 }
 
 @end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryView.h b/Libraries/Text/TextInput/RCTInputAccessoryView.h
new file mode 100644
index 00000000000000..b2517534baf3bb
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryView.h
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+@class RCTBridge;
+@class RCTInputAccessoryViewContent;
+
+@interface RCTInputAccessoryView : UIView
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge;
+
+@property (nonatomic, readonly, strong) RCTInputAccessoryViewContent *content;
+
+@end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryView.m b/Libraries/Text/TextInput/RCTInputAccessoryView.m
new file mode 100644
index 00000000000000..a1902a80ea5fd4
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryView.m
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTInputAccessoryView.h"
+
+#import <React/RCTBridge.h>
+#import <React/RCTTouchHandler.h>
+#import <React/UIView+React.h>
+
+#import "RCTInputAccessoryViewContent.h"
+
+@implementation RCTInputAccessoryView
+{
+  BOOL _contentShouldBeFirstResponder;
+}
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+{
+  if (self = [super init]) {
+    _content = [RCTInputAccessoryViewContent new];
+    RCTTouchHandler *const touchHandler = [[RCTTouchHandler alloc] initWithBridge:bridge];
+    [touchHandler attachToView:_content.inputAccessoryView];
+    [self addSubview:_content];
+  }
+  return self;
+}
+
+- (void)reactSetFrame:(CGRect)frame
+{
+  [_content.inputAccessoryView setFrame:frame];
+  [_content.contentView setFrame:frame];
+
+  if (_contentShouldBeFirstResponder) {
+    _contentShouldBeFirstResponder = NO;
+    [_content becomeFirstResponder];
+  }
+}
+
+- (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)index
+{
+  [super insertReactSubview:subview atIndex:index];
+  [_content insertReactSubview:subview atIndex:index];
+}
+
+- (void)removeReactSubview:(UIView *)subview
+{
+  [super removeReactSubview:subview];
+  [_content removeReactSubview:subview];
+}
+
+- (void)didUpdateReactSubviews
+{
+  // Do nothing, as subviews are managed by `insertReactSubview:atIndex:`
+}
+
+- (void)didSetProps:(NSArray<NSString *> *)changedProps
+{
+  // If the accessory view is not linked to a text input via nativeID, assume it is
+  // a standalone component that should get focus whenever it is rendered
+  if (![changedProps containsObject:@"nativeID"] && !self.nativeID) {
+    _contentShouldBeFirstResponder = YES;
+  }
+}
+
+@end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h
new file mode 100644
index 00000000000000..7c24d010e2d270
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface RCTInputAccessoryViewContent : UIView
+
+@property (nonatomic, readwrite, retain) UIView *contentView;
+
+@end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
new file mode 100644
index 00000000000000..3fb7fca715c608
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTInputAccessoryViewContent.h"
+
+#import <React/UIView+React.h>
+
+@interface RCTInputAccessoryViewContent()
+
+// Overriding `inputAccessoryView` to `readwrite`.
+@property (nonatomic, readwrite, retain) UIView *inputAccessoryView;
+
+@end
+
+@implementation RCTInputAccessoryViewContent
+
+- (BOOL)canBecomeFirstResponder
+{
+  return true;
+}
+
+- (BOOL)becomeFirstResponder
+{
+  const BOOL becameFirstResponder = [super becomeFirstResponder];
+
+  #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
+  // Avoiding the home pill and notch (landscape mode) on iphoneX.
+  if (becameFirstResponder) {
+    if (@available(iOS 11.0, *)) {
+      [_contentView.bottomAnchor
+       constraintLessThanOrEqualToSystemSpacingBelowAnchor:_contentView.window.safeAreaLayoutGuide.bottomAnchor
+       multiplier:1.0f].active = YES;
+      [_contentView.leftAnchor
+       constraintLessThanOrEqualToSystemSpacingAfterAnchor:_contentView.window.safeAreaLayoutGuide.leftAnchor
+       multiplier:1.0f].active = YES;
+      [_contentView.rightAnchor
+       constraintLessThanOrEqualToSystemSpacingAfterAnchor:_contentView.window.safeAreaLayoutGuide.rightAnchor
+       multiplier:1.0f].active = YES;
+    }
+  }
+  #endif
+
+  return becameFirstResponder;
+}
+
+- (UIView *)inputAccessoryView
+{
+  if (!_inputAccessoryView) {
+    _inputAccessoryView = [UIView new];
+    _contentView = [UIView new];
+    [_inputAccessoryView addSubview:_contentView];
+  }
+  return _inputAccessoryView;
+}
+
+- (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)index
+{
+  [super insertReactSubview:subview atIndex:index];
+  [_contentView insertSubview:subview atIndex:index];
+}
+
+- (void)removeReactSubview:(UIView *)subview
+{
+  [super removeReactSubview:subview];
+  [subview removeFromSuperview];
+  if ([[_inputAccessoryView subviews] count] == 0 && [self isFirstResponder]) {
+    [self resignFirstResponder];
+  }
+}
+
+@end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h
new file mode 100644
index 00000000000000..590723a5631716
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTViewManager.h>
+
+@interface RCTInputAccessoryViewManager : RCTViewManager
+
+@end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m
new file mode 100644
index 00000000000000..b293889eb6de84
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTInputAccessoryViewManager.h"
+
+#import "RCTInputAccessoryView.h"
+
+@implementation RCTInputAccessoryViewManager
+
+RCT_EXPORT_MODULE()
+
++ (BOOL)requiresMainQueueSetup
+{
+  return NO;
+}
+
+- (UIView *)view
+{
+  return [[RCTInputAccessoryView alloc] initWithBridge:self.bridge];
+}
+
+RCT_REMAP_VIEW_PROPERTY(backgroundColor, content.inputAccessoryView.backgroundColor, UIColor)
+
+@end
diff --git a/Libraries/Text/TextInput/RCTTextSelection.h b/Libraries/Text/TextInput/RCTTextSelection.h
index 804af5f283845f..b77746a91647d6 100644
--- a/Libraries/Text/TextInput/RCTTextSelection.h
+++ b/Libraries/Text/TextInput/RCTTextSelection.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/Libraries/Text/TextInput/RCTTextSelection.m b/Libraries/Text/TextInput/RCTTextSelection.m
index f37d00662d6d6c..436228c5545ab2 100644
--- a/Libraries/Text/TextInput/RCTTextSelection.m
+++ b/Libraries/Text/TextInput/RCTTextSelection.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTextSelection.h"
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h
index 5338e0c630c870..1c99fed6354501 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputView.h"
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
index 4f4959b63616a1..d3e29b266aad02 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSinglelineTextInputView.h"
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h
index 57439e6bf35b06..b19ff183925daa 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputViewManager.h"
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
index 6a74da53c98a23..4399c3677ff6ac 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSinglelineTextInputViewManager.h"
diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.h b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
index 27ae073006f3f8..a2e7a0e0c61bd6 100644
--- a/Libraries/Text/TextInput/Singleline/RCTUITextField.h
+++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
@@ -23,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak) id<RCTBackedTextInputDelegate> textInputDelegate;
 
 @property (nonatomic, assign) BOOL caretHidden;
+@property (nonatomic, assign) BOOL contextMenuHidden;
 @property (nonatomic, assign, readonly) BOOL textWasPasted;
 @property (nonatomic, strong, nullable) UIColor *placeholderColor;
 @property (nonatomic, assign) UIEdgeInsets textContainerInset;
diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
index 4b21e594b1bfd0..83e7603ae83506 100644
--- a/Libraries/Text/TextInput/Singleline/RCTUITextField.m
+++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUITextField.h"
@@ -87,6 +85,17 @@ - (void)setEditable:(BOOL)editable
   self.enabled = editable;
 }
 
+#pragma mark - Context Menu
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+  if (_contextMenuHidden) {
+    return NO;
+  }
+
+  return [super canPerformAction:action withSender:sender];
+}
+
 #pragma mark - Caret Manipulation
 
 - (CGRect)caretRectForPosition:(UITextPosition *)position
diff --git a/Libraries/Text/TextPropTypes.js b/Libraries/Text/TextPropTypes.js
new file mode 100644
index 00000000000000..81a7af03f6058f
--- /dev/null
+++ b/Libraries/Text/TextPropTypes.js
@@ -0,0 +1,128 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule TextPropTypes
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+const ColorPropType = require('ColorPropType');
+const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const PropTypes = require('prop-types');
+const StyleSheetPropType = require('StyleSheetPropType');
+const TextStylePropTypes = require('TextStylePropTypes');
+
+const stylePropType = StyleSheetPropType(TextStylePropTypes);
+
+module.exports = {
+  /**
+   * When `numberOfLines` is set, this prop defines how text will be
+   * truncated.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#ellipsizemode
+   */
+  ellipsizeMode: PropTypes.oneOf(['head', 'middle', 'tail', 'clip']),
+  /**
+   * Used to truncate the text with an ellipsis.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#numberoflines
+   */
+  numberOfLines: PropTypes.number,
+  /**
+   * Set text break strategy on Android.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#textbreakstrategy
+   */
+  textBreakStrategy: PropTypes.oneOf(['simple', 'highQuality', 'balanced']),
+  /**
+   * Invoked on mount and layout changes.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#onlayout
+   */
+  onLayout: PropTypes.func,
+  /**
+   * This function is called on press.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#onpress
+   */
+  onPress: PropTypes.func,
+  /**
+   * This function is called on long press.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#onlongpress
+   */
+  onLongPress: PropTypes.func,
+  /**
+   * Defines how far your touch may move off of the button, before
+   * deactivating the button.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#pressretentionoffset
+   */
+  pressRetentionOffset: EdgeInsetsPropType,
+  /**
+   * Lets the user select text.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#selectable
+   */
+  selectable: PropTypes.bool,
+  /**
+   * The highlight color of the text.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#selectioncolor
+   */
+  selectionColor: ColorPropType,
+  /**
+   * When `true`, no visual change is made when text is pressed down.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#supperhighlighting
+   */
+  suppressHighlighting: PropTypes.bool,
+  style: stylePropType,
+  /**
+   * Used to locate this view in end-to-end tests.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#testid
+   */
+  testID: PropTypes.string,
+  /**
+   * Used to locate this view from native code.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#nativeid
+   */
+  nativeID: PropTypes.string,
+  /**
+   * Whether fonts should scale to respect Text Size accessibility settings.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#allowfontscaling
+   */
+  allowFontScaling: PropTypes.bool,
+  /**
+   * Indicates whether the view is an accessibility element.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#accessible
+   */
+  accessible: PropTypes.bool,
+  /**
+   * Whether font should be scaled down automatically.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#adjustsfontsizetofit
+   */
+  adjustsFontSizeToFit: PropTypes.bool,
+  /**
+   * Smallest possible scale a font can reach.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#minimumfontscale
+   */
+  minimumFontScale: PropTypes.number,
+  /**
+   * Specifies the disabled state of the text view for testing purposes.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#disabled
+   */
+  disabled: PropTypes.bool,
+};
diff --git a/Libraries/Text/TextProps.js b/Libraries/Text/TextProps.js
index 309f5fc6b73066..20eb363765e215 100644
--- a/Libraries/Text/TextProps.js
+++ b/Libraries/Text/TextProps.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextProps
  * @flow
@@ -15,8 +13,8 @@
 
 import type {Node} from 'react';
 
-import type {LayoutEvent} from 'CoreEventTypes';
-import type {TextStyleProp} from 'StyleSheetTypes';
+import type {LayoutEvent, PressEvent} from 'CoreEventTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 
 type PressRetentionOffset = {
   top: number,
@@ -28,28 +26,34 @@ type PressRetentionOffset = {
 /**
  * @see https://facebook.github.io/react-native/docs/text.html#reference
  */
-export type TextProps = {|
-  accessible?: boolean,
-  allowFontScaling?: boolean,
+export type TextProps = $ReadOnly<{
+  accessible?: ?boolean,
+  allowFontScaling?: ?boolean,
   children?: Node,
   ellipsizeMode?: 'clip' | 'head' | 'middle' | 'tail',
   nativeID?: string,
-  numberOfLines?: number,
-  onLayout?: ?(event: LayoutEvent) => void,
-  onLongPress?: ?() => void,
-  onPress?: ?() => void,
-  pressRetentionOffset?: PressRetentionOffset,
-  selectable?: boolean,
-  style?: TextStyleProp,
+  numberOfLines?: ?number,
+  onLayout?: ?(event: LayoutEvent) => mixed,
+  onLongPress?: ?(event: PressEvent) => mixed,
+  onPress?: ?(event: PressEvent) => mixed,
+  onResponderGrant?: ?Function,
+  onResponderMove?: ?Function,
+  onResponderRelease?: ?Function,
+  onResponderTerminate?: ?Function,
+  onResponderTerminationRequest?: ?Function,
+  onStartShouldSetResponder?: ?Function,
+  pressRetentionOffset?: ?PressRetentionOffset,
+  selectable?: ?boolean,
+  style?: ?DangerouslyImpreciseStyleProp,
   testID?: string,
 
   // Android Only
-  disabled?: boolean,
-  selectionColor?: string,
+  disabled?: ?boolean,
+  selectionColor?: ?string,
   textBreakStrategy?: 'balanced' | 'highQuality' | 'simple',
 
   // iOS Only
-  adjustsFontSizeToFit?: boolean,
-  minimumFontScale?: number,
-  suppressHighlighting?: boolean,
-|};
+  adjustsFontSizeToFit?: ?boolean,
+  minimumFontScale?: ?number,
+  suppressHighlighting?: ?boolean,
+}>;
diff --git a/Libraries/Text/TextStylePropTypes.js b/Libraries/Text/TextStylePropTypes.js
index d92708683d981e..c5e67ca99e17f5 100644
--- a/Libraries/Text/TextStylePropTypes.js
+++ b/Libraries/Text/TextStylePropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextStylePropTypes
  * @flow
diff --git a/Libraries/Text/TextUpdateTest.js b/Libraries/Text/TextUpdateTest.js
index f0de98e9a3ae48..ec81ddab1c7903 100644
--- a/Libraries/Text/TextUpdateTest.js
+++ b/Libraries/Text/TextUpdateTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextUpdateTest
  * @flow
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h
index ae5d158b0ef860..159a155f994a7b 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h
+++ b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextShadowView.h"
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
index b5710f13c0545e..55fd8a6eef5746 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
+++ b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTVirtualTextShadowView.h"
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h
index b7225dbb51652e..cf2072f5df5750 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h
+++ b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextViewManager.h"
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m
index 64cf1617202bc5..adc3c885405e36 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m
+++ b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTVirtualTextViewManager.h"
diff --git a/Libraries/Types/CoreEventTypes.js b/Libraries/Types/CoreEventTypes.js
index db66628811d68e..56d4eecf8c348b 100644
--- a/Libraries/Types/CoreEventTypes.js
+++ b/Libraries/Types/CoreEventTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CoreEventTypes
  * @flow
@@ -13,55 +11,73 @@
 
 'use strict';
 
-export type Layout = {|
-  +x: number,
-  +y: number,
-  +width: number,
-  +height: number,
-|};
-export type LayoutEvent = SyntheticEvent<{|
-  +layout: Layout,
+export type SyntheticEvent<T> = $ReadOnly<{|
+  bubbles: ?boolean,
+  cancelable: ?boolean,
+  currentTarget: number,
+  defaultPrevented: ?boolean,
+  dispatchConfig: $ReadOnly<{|
+    registrationName: string,
+  |}>,
+  eventPhase: ?number,
+  isDefaultPrevented: () => boolean,
+  isPropagationStopped: () => boolean,
+  isTrusted: ?boolean,
+  nativeEvent: T,
+  persist: () => void,
+  target: ?number,
+  timeStamp: number,
+  type: ?string,
 |}>;
 
-export type SyntheticEvent<T> = {|
-  +bubbles: ?boolean,
-  +cancelable: ?boolean,
-  +currentTarget: number,
-  +defaultPrevented: ?boolean,
-  +dispatchConfig: {|
-    +registrationName: string,
-  |},
-  +eventPhase: ?number,
-  +isDefaultPrevented: () => boolean,
-  +isPropagationStopped: () => boolean,
-  +isTrusted: ?boolean,
-  +nativeEvent: T,
-  +persist: () => void,
-  +target: ?number,
-  +timeStamp: number,
-  +type: ?string,
-|};
+export type Layout = $ReadOnly<{|
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+|}>;
 
-export type PressEvent = SyntheticEvent<Object>;
+export type LayoutEvent = SyntheticEvent<
+  $ReadOnly<{|
+    layout: Layout,
+  |}>,
+>;
 
-export type ScrollEvent = SyntheticEvent<{|
-  +contentInset: {|
-    +bottom: number,
-    +left: number,
-    +right: number,
-    +top: number,
-  |},
-  +contentOffset: {|
-    +y: number,
-    +x: number,
-  |},
-  +contentSize: {|
-    +height: number,
-    +width: number,
-  |},
-  +layoutMeasurement: {|
-    +height: number,
-    +width: number,
-  |},
-  +zoomScale: number,
-|}>;
+export type PressEvent = SyntheticEvent<
+  $ReadOnly<{|
+    changedTouches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,
+    force: number,
+    identifier: number,
+    locationX: number,
+    locationY: number,
+    pageX: number,
+    pageY: number,
+    target: ?number,
+    timestamp: number,
+    touches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,
+  |}>,
+>;
+
+export type ScrollEvent = SyntheticEvent<
+  $ReadOnly<{|
+    contentInset: $ReadOnly<{|
+      bottom: number,
+      left: number,
+      right: number,
+      top: number,
+    |}>,
+    contentOffset: $ReadOnly<{|
+      y: number,
+      x: number,
+    |}>,
+    contentSize: $ReadOnly<{|
+      height: number,
+      width: number,
+    |}>,
+    layoutMeasurement: $ReadOnly<{|
+      height: number,
+      width: number,
+    |}>,
+    zoomScale: number,
+  |}>,
+>;
diff --git a/Libraries/UTFSequence.js b/Libraries/UTFSequence.js
new file mode 100644
index 00000000000000..9bff51555d5563
--- /dev/null
+++ b/Libraries/UTFSequence.js
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule UTFSequence
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');
+
+/**
+ * A collection of Unicode sequences for various characters and emoji.
+ *
+ *  - More explicit than using the sequences directly in code.
+ *  - Source code should be limitted to ASCII.
+ *  - Less chance of typos.
+ */
+const UTFSequence = deepFreezeAndThrowOnMutationInDev({
+  BULLET: '\u2022', // bullet: &#8226;
+  BULLET_SP: '\u00A0\u2022\u00A0', // &nbsp;&#8226;&nbsp;
+  MIDDOT: '\u00B7', // normal middle dot: &middot;
+  MIDDOT_SP: '\u00A0\u00B7\u00A0', // &nbsp;&middot;&nbsp;
+  MIDDOT_KATAKANA: '\u30FB', // katakana middle dot
+  MDASH: '\u2014', // em dash: &mdash;
+  MDASH_SP: '\u00A0\u2014\u00A0', // &nbsp;&mdash;&nbsp;
+  NDASH: '\u2013', // en dash: &ndash;
+  NDASH_SP: '\u00A0\u2013\u00A0', // &nbsp;&ndash;&nbsp;
+  NBSP: '\u00A0', // non-breaking space: &nbsp;
+  PIZZA: '\uD83C\uDF55',
+});
+
+module.exports = UTFSequence;
diff --git a/Libraries/Utilities/BackAndroid.js b/Libraries/Utilities/BackAndroid.js
index 0289b34c65d82c..4fc029341f4b9e 100644
--- a/Libraries/Utilities/BackAndroid.js
+++ b/Libraries/Utilities/BackAndroid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * BackAndroid has been moved to BackHandler.  This stub calls BackHandler methods
  * after generating a warning to remind users to move to the new BackHandler module.
diff --git a/Libraries/Utilities/BackHandler.android.js b/Libraries/Utilities/BackHandler.android.js
index e9ccd1a5809390..8f34cfacd1c349 100644
--- a/Libraries/Utilities/BackHandler.android.js
+++ b/Libraries/Utilities/BackHandler.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BackHandler
  */
diff --git a/Libraries/Utilities/BackHandler.ios.js b/Libraries/Utilities/BackHandler.ios.js
index 7c9a00ecc4e8bf..33c6a8c1d6aa48 100644
--- a/Libraries/Utilities/BackHandler.ios.js
+++ b/Libraries/Utilities/BackHandler.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * On Apple TV, this implements back navigation using the TV remote's menu button.
  * On iOS, this just implements a stub.
diff --git a/Libraries/Utilities/DebugEnvironment.js b/Libraries/Utilities/DebugEnvironment.js
deleted file mode 100644
index 375d0f4d485b36..00000000000000
--- a/Libraries/Utilities/DebugEnvironment.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule DebugEnvironment
- * @flow
- */
-
-'use strict';
-
-module.exports = {
-  // When crippled, synchronous JS function calls to native will fail.
-  isCrippledMode: __DEV__ && !global.nativeCallSyncHook,
-};
diff --git a/Libraries/Utilities/DeviceInfo.js b/Libraries/Utilities/DeviceInfo.js
index 819916b153f84a..8503ac75ca31f5 100644
--- a/Libraries/Utilities/DeviceInfo.js
+++ b/Libraries/Utilities/DeviceInfo.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DeviceInfo
  * @flow
diff --git a/Libraries/Utilities/Dimensions.js b/Libraries/Utilities/Dimensions.js
index 898c8cbe89580f..d13b14f1bd18ea 100644
--- a/Libraries/Utilities/Dimensions.js
+++ b/Libraries/Utilities/Dimensions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Dimensions
  * @flow
diff --git a/Libraries/Utilities/HMRClient.js b/Libraries/Utilities/HMRClient.js
index 27246a3482b85b..ff897afda8bf99 100644
--- a/Libraries/Utilities/HMRClient.js
+++ b/Libraries/Utilities/HMRClient.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule HMRClient
  * @format
diff --git a/Libraries/Utilities/HMRLoadingView.android.js b/Libraries/Utilities/HMRLoadingView.android.js
index 82075ffa1920b6..ebda3ee65c81ec 100644
--- a/Libraries/Utilities/HMRLoadingView.android.js
+++ b/Libraries/Utilities/HMRLoadingView.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule HMRLoadingView
  * @flow
diff --git a/Libraries/Utilities/HMRLoadingView.ios.js b/Libraries/Utilities/HMRLoadingView.ios.js
index ea0559fc41d0dd..7100164d4ca667 100644
--- a/Libraries/Utilities/HMRLoadingView.ios.js
+++ b/Libraries/Utilities/HMRLoadingView.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule HMRLoadingView
  * @flow
diff --git a/Libraries/Utilities/HeapCapture.js b/Libraries/Utilities/HeapCapture.js
index d686a903c8866a..49e9d678e1eef2 100644
--- a/Libraries/Utilities/HeapCapture.js
+++ b/Libraries/Utilities/HeapCapture.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule HeapCapture
  * @flow
diff --git a/Libraries/Utilities/JSDevSupportModule.js b/Libraries/Utilities/JSDevSupportModule.js
index 3aa91255f5725f..a33e91e886185b 100644
--- a/Libraries/Utilities/JSDevSupportModule.js
+++ b/Libraries/Utilities/JSDevSupportModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule JSDevSupportModule
  * @flow
@@ -20,7 +18,6 @@ var JSDevSupportModule = {
 
     var result = renderer.getInspectorDataForViewTag(tag);
     var path = result.hierarchy.map( (item) => item.name).join(' -> ');
-    console.error('StackOverflowException rendering JSComponent: ' + path);
     require('NativeModules').JSDevSupport.setResult(path, null);
   },
 };
diff --git a/Libraries/Utilities/MatrixMath.js b/Libraries/Utilities/MatrixMath.js
index e5f82ea1b3eab5..b36b316833fcb7 100755
--- a/Libraries/Utilities/MatrixMath.js
+++ b/Libraries/Utilities/MatrixMath.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MatrixMath
  * @noflow
diff --git a/Libraries/Utilities/PerformanceLogger.js b/Libraries/Utilities/PerformanceLogger.js
index 584da0886bbd56..95b5f4924e89ef 100644
--- a/Libraries/Utilities/PerformanceLogger.js
+++ b/Libraries/Utilities/PerformanceLogger.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PerformanceLogger
  * @flow
@@ -111,6 +109,9 @@ const PerformanceLogger = {
   clear() {
     timespans = {};
     extras = {};
+    if (__DEV__ && PRINT_TO_CONSOLE) {
+      infoLog('PerformanceLogger.js', 'clear');
+    }
   },
 
   clearCompleted() {
@@ -120,6 +121,9 @@ const PerformanceLogger = {
       }
     }
     extras = {};
+    if (__DEV__ && PRINT_TO_CONSOLE) {
+      infoLog('PerformanceLogger.js', 'clearCompleted');
+    }
   },
 
   clearExceptTimespans(keys: Array<string>) {
diff --git a/Libraries/Utilities/PixelRatio.js b/Libraries/Utilities/PixelRatio.js
index 6d68ef03c70e2c..bd8a6a0b9571dc 100644
--- a/Libraries/Utilities/PixelRatio.js
+++ b/Libraries/Utilities/PixelRatio.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PixelRatio
  * @flow
diff --git a/Libraries/Utilities/Platform.android.js b/Libraries/Utilities/Platform.android.js
index 4bab19c5287227..f0e80633f2f283 100644
--- a/Libraries/Utilities/Platform.android.js
+++ b/Libraries/Utilities/Platform.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Platform
  * @flow
@@ -24,6 +22,10 @@ const Platform = {
     const constants = NativeModules.PlatformConstants;
     return constants && constants.isTesting;
   },
+  get isTV(): boolean {
+    const constants = NativeModules.PlatformConstants;
+    return constants && constants.uiMode === 'tv';
+  },
   select: (obj: Object) => 'android' in obj ? obj.android : obj.default,
 };
 
diff --git a/Libraries/Utilities/Platform.ios.js b/Libraries/Utilities/Platform.ios.js
index 3238a44627fe9c..776880b7fa400d 100644
--- a/Libraries/Utilities/Platform.ios.js
+++ b/Libraries/Utilities/Platform.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Platform
  * @flow
@@ -24,7 +22,13 @@ const Platform = {
     const constants = NativeModules.PlatformConstants;
     return constants ? constants.interfaceIdiom === 'pad' : false;
   },
+  /**
+   * Deprecated, use `isTV` instead.
+   */
   get isTVOS() {
+    return Platform.isTV;
+  },
+  get isTV() {
     const constants = NativeModules.PlatformConstants;
     return constants ? constants.interfaceIdiom === 'tv' : false;
   },
diff --git a/Libraries/Utilities/PlatformOS.android.js b/Libraries/Utilities/PlatformOS.android.js
index 2da52e6e711ce9..ff2a383759c455 100644
--- a/Libraries/Utilities/PlatformOS.android.js
+++ b/Libraries/Utilities/PlatformOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PlatformOS
  * @flow
diff --git a/Libraries/Utilities/PlatformOS.ios.js b/Libraries/Utilities/PlatformOS.ios.js
index c9891368d8981f..11fed5978096cb 100644
--- a/Libraries/Utilities/PlatformOS.ios.js
+++ b/Libraries/Utilities/PlatformOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PlatformOS
  * @flow
diff --git a/Libraries/Utilities/PolyfillFunctions.js b/Libraries/Utilities/PolyfillFunctions.js
new file mode 100644
index 00000000000000..5bf31ee118b4d2
--- /dev/null
+++ b/Libraries/Utilities/PolyfillFunctions.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule PolyfillFunctions
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+const defineLazyObjectProperty = require('defineLazyObjectProperty');
+
+/**
+ * Sets an object's property. If a property with the same name exists, this will
+ * replace it but maintain its descriptor configuration. The property will be
+ * replaced with a lazy getter.
+ *
+ * In DEV mode the original property value will be preserved as `original[PropertyName]`
+ * so that, if necessary, it can be restored. For example, if you want to route
+ * network requests through DevTools (to trace them):
+ *
+ *   global.XMLHttpRequest = global.originalXMLHttpRequest;
+ *
+ * @see https://github.com/facebook/react-native/issues/934
+ */
+function polyfillObjectProperty<T>(
+  object: Object,
+  name: string,
+  getValue: () => T,
+): void {
+  const descriptor = Object.getOwnPropertyDescriptor(object, name);
+  if (__DEV__ && descriptor) {
+    const backupName = `original${name[0].toUpperCase()}${name.substr(1)}`;
+    Object.defineProperty(object, backupName, {
+      ...descriptor,
+      value: object[name],
+    });
+  }
+
+  const {enumerable, writable, configurable} = descriptor || {};
+  if (descriptor && !configurable) {
+    console.error('Failed to set polyfill. ' + name + ' is not configurable.');
+    return;
+  }
+
+  defineLazyObjectProperty(object, name, {
+    get: getValue,
+    enumerable: enumerable !== false,
+    writable: writable !== false,
+  });
+}
+
+function polyfillGlobal<T>(name: string, getValue: () => T): void {
+  polyfillObjectProperty(global, name, getValue);
+}
+
+module.exports = {polyfillObjectProperty, polyfillGlobal};
diff --git a/Libraries/Utilities/RCTLog.js b/Libraries/Utilities/RCTLog.js
index a51d38d2d36cff..2514d9b4039d29 100644
--- a/Libraries/Utilities/RCTLog.js
+++ b/Libraries/Utilities/RCTLog.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTLog
  * @flow
diff --git a/Libraries/Utilities/SceneTracker.js b/Libraries/Utilities/SceneTracker.js
index 568bf62aaeece4..9cebe76a99d5d2 100644
--- a/Libraries/Utilities/SceneTracker.js
+++ b/Libraries/Utilities/SceneTracker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SceneTracker
  * @flow
diff --git a/Libraries/Utilities/__mocks__/BackHandler.js b/Libraries/Utilities/__mocks__/BackHandler.js
index e8b5435e2ea069..e6319f8974ac80 100644
--- a/Libraries/Utilities/__mocks__/BackHandler.js
+++ b/Libraries/Utilities/__mocks__/BackHandler.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/Utilities/__mocks__/PixelRatio.js b/Libraries/Utilities/__mocks__/PixelRatio.js
index 36e5bacdf3108a..242d4773380ee3 100644
--- a/Libraries/Utilities/__mocks__/PixelRatio.js
+++ b/Libraries/Utilities/__mocks__/PixelRatio.js
@@ -1,5 +1,8 @@
 /**
- * Copyright 2004-present Facebook. All Rights Reserved.
+ * Copyright (c) 2004-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/MatrixMath-test.js b/Libraries/Utilities/__tests__/MatrixMath-test.js
index 35d120a2ffed0f..2eb14cb5ba3c7b 100644
--- a/Libraries/Utilities/__tests__/MatrixMath-test.js
+++ b/Libraries/Utilities/__tests__/MatrixMath-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/Platform-test.js b/Libraries/Utilities/__tests__/Platform-test.js
index 14a789153fd16b..1fdfaaa1a75ca3 100644
--- a/Libraries/Utilities/__tests__/Platform-test.js
+++ b/Libraries/Utilities/__tests__/Platform-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/SceneTracker-test.js b/Libraries/Utilities/__tests__/SceneTracker-test.js
index bb81d4eae7b090..22dd9cadba85de 100644
--- a/Libraries/Utilities/__tests__/SceneTracker-test.js
+++ b/Libraries/Utilities/__tests__/SceneTracker-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js b/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
index 5f537f4519d00a..ccb5f7edfb31c5 100644
--- a/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
+++ b/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js b/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
index f8791a68a35e56..cc307eedac0ee8 100644
--- a/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
+++ b/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/groupByEveryN-test.js b/Libraries/Utilities/__tests__/groupByEveryN-test.js
index e5b9d80ac0f09e..5fe34833549e2f 100644
--- a/Libraries/Utilities/__tests__/groupByEveryN-test.js
+++ b/Libraries/Utilities/__tests__/groupByEveryN-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/mapWithSeparator-test.js b/Libraries/Utilities/__tests__/mapWithSeparator-test.js
index 0e42f0b1ef1ccb..8f64e0dfa17d38 100644
--- a/Libraries/Utilities/__tests__/mapWithSeparator-test.js
+++ b/Libraries/Utilities/__tests__/mapWithSeparator-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/truncate-test.js b/Libraries/Utilities/__tests__/truncate-test.js
index c134ec47ee2163..9c38d1e1e701c9 100644
--- a/Libraries/Utilities/__tests__/truncate-test.js
+++ b/Libraries/Utilities/__tests__/truncate-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/binaryToBase64.js b/Libraries/Utilities/binaryToBase64.js
index 008c6ac19c7b7f..d17c4d403c8705 100644
--- a/Libraries/Utilities/binaryToBase64.js
+++ b/Libraries/Utilities/binaryToBase64.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule binaryToBase64
  * @flow
diff --git a/Libraries/Utilities/buildStyleInterpolator.js b/Libraries/Utilities/buildStyleInterpolator.js
index 41d65e1bf344b9..ec174441173965 100644
--- a/Libraries/Utilities/buildStyleInterpolator.js
+++ b/Libraries/Utilities/buildStyleInterpolator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule buildStyleInterpolator
  */
diff --git a/Libraries/Utilities/clamp.js b/Libraries/Utilities/clamp.js
index 46d67895d4821c..5d15d8b3b12f3f 100644
--- a/Libraries/Utilities/clamp.js
+++ b/Libraries/Utilities/clamp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule clamp
  * @typechecks
diff --git a/Libraries/Utilities/createStrictShapeTypeChecker.js b/Libraries/Utilities/createStrictShapeTypeChecker.js
index 078d103a3e2cbe..89347d15e0b86a 100644
--- a/Libraries/Utilities/createStrictShapeTypeChecker.js
+++ b/Libraries/Utilities/createStrictShapeTypeChecker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule createStrictShapeTypeChecker
  * @flow
diff --git a/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js b/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
index 9ab2cc4b16a000..19cb60a9c56d6f 100644
--- a/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
+++ b/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule deepFreezeAndThrowOnMutationInDev
  * @flow
@@ -29,13 +27,13 @@
  * Freezing the object and adding the throw mechanism is expensive and will
  * only be used in DEV.
  */
-function deepFreezeAndThrowOnMutationInDev(object: Object) {
+function deepFreezeAndThrowOnMutationInDev<T: Object>(object: T): T {
   if (__DEV__) {
     if (typeof object !== 'object' ||
         object === null ||
         Object.isFrozen(object) ||
         Object.isSealed(object)) {
-      return;
+      return object;
     }
 
     var keys = Object.keys(object);
@@ -58,6 +56,7 @@ function deepFreezeAndThrowOnMutationInDev(object: Object) {
       }
     }
   }
+  return object;
 }
 
 function throwOnImmutableMutation(key, value) {
diff --git a/Libraries/Utilities/defineLazyObjectProperty.js b/Libraries/Utilities/defineLazyObjectProperty.js
index 25c5e0057b38ee..87e893037913b4 100644
--- a/Libraries/Utilities/defineLazyObjectProperty.js
+++ b/Libraries/Utilities/defineLazyObjectProperty.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule defineLazyObjectProperty
  * @flow
diff --git a/Libraries/Utilities/deprecatedPropType.js b/Libraries/Utilities/deprecatedPropType.js
index 26a1a46bf4c947..8b08854fabb043 100644
--- a/Libraries/Utilities/deprecatedPropType.js
+++ b/Libraries/Utilities/deprecatedPropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule deprecatedPropType
  * @flow
diff --git a/Libraries/Utilities/differ/__tests__/deepDiffer-test.js b/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
index 7ff8e664f06872..6fadfdbe575478 100644
--- a/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
+++ b/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/differ/deepDiffer.js b/Libraries/Utilities/differ/deepDiffer.js
index 4dec6bd7bb892d..af0bd295694b19 100644
--- a/Libraries/Utilities/differ/deepDiffer.js
+++ b/Libraries/Utilities/differ/deepDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule deepDiffer
  * @flow
diff --git a/Libraries/Utilities/differ/insetsDiffer.js b/Libraries/Utilities/differ/insetsDiffer.js
index df81eff93b703a..1d497c0948e53a 100644
--- a/Libraries/Utilities/differ/insetsDiffer.js
+++ b/Libraries/Utilities/differ/insetsDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule insetsDiffer
  * @flow
diff --git a/Libraries/Utilities/differ/matricesDiffer.js b/Libraries/Utilities/differ/matricesDiffer.js
index 948cc4cd08545c..25e741a4ff8283 100644
--- a/Libraries/Utilities/differ/matricesDiffer.js
+++ b/Libraries/Utilities/differ/matricesDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule matricesDiffer
  */
diff --git a/Libraries/Utilities/differ/pointsDiffer.js b/Libraries/Utilities/differ/pointsDiffer.js
index 7c22bf1978bf4a..cb41cec85494a4 100644
--- a/Libraries/Utilities/differ/pointsDiffer.js
+++ b/Libraries/Utilities/differ/pointsDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule pointsDiffer
  * @flow
diff --git a/Libraries/Utilities/differ/sizesDiffer.js b/Libraries/Utilities/differ/sizesDiffer.js
index 7b24ea52f8dc43..55ea66ded36ca5 100644
--- a/Libraries/Utilities/differ/sizesDiffer.js
+++ b/Libraries/Utilities/differ/sizesDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule sizesDiffer
  */
diff --git a/Libraries/Utilities/dismissKeyboard.js b/Libraries/Utilities/dismissKeyboard.js
index 183fa4a88caf3a..febcc82bfa9a65 100644
--- a/Libraries/Utilities/dismissKeyboard.js
+++ b/Libraries/Utilities/dismissKeyboard.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule dismissKeyboard
  *
diff --git a/Libraries/Utilities/groupByEveryN.js b/Libraries/Utilities/groupByEveryN.js
index a8b353ad66dde6..ea400392291231 100644
--- a/Libraries/Utilities/groupByEveryN.js
+++ b/Libraries/Utilities/groupByEveryN.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule groupByEveryN
  * @flow
diff --git a/Libraries/Utilities/infoLog.js b/Libraries/Utilities/infoLog.js
index 6a2a726a60822d..66278f520e8424 100644
--- a/Libraries/Utilities/infoLog.js
+++ b/Libraries/Utilities/infoLog.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule infoLog
  */
diff --git a/Libraries/Utilities/logError.js b/Libraries/Utilities/logError.js
index 62a8d984e6b251..6cf212b1f14712 100644
--- a/Libraries/Utilities/logError.js
+++ b/Libraries/Utilities/logError.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule logError
  * @flow
diff --git a/Libraries/Utilities/mapWithSeparator.js b/Libraries/Utilities/mapWithSeparator.js
index ff3048a2609df6..0beceda0174c0f 100644
--- a/Libraries/Utilities/mapWithSeparator.js
+++ b/Libraries/Utilities/mapWithSeparator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule mapWithSeparator
  * @flow
diff --git a/Libraries/Utilities/mergeFast.js b/Libraries/Utilities/mergeFast.js
index 78a06cb4be4120..60ad36c20464a8 100644
--- a/Libraries/Utilities/mergeFast.js
+++ b/Libraries/Utilities/mergeFast.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule mergeFast
  * @flow
diff --git a/Libraries/Utilities/mergeIntoFast.js b/Libraries/Utilities/mergeIntoFast.js
index b7160875a453b0..ff048311403a87 100644
--- a/Libraries/Utilities/mergeIntoFast.js
+++ b/Libraries/Utilities/mergeIntoFast.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule mergeIntoFast
  * @flow
diff --git a/Libraries/Utilities/stringifySafe.js b/Libraries/Utilities/stringifySafe.js
index 750a932b644970..39ada622714243 100644
--- a/Libraries/Utilities/stringifySafe.js
+++ b/Libraries/Utilities/stringifySafe.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule stringifySafe
  * @flow
diff --git a/Libraries/Utilities/truncate.js b/Libraries/Utilities/truncate.js
index 96c423225b116b..0e0d8c643ea55e 100644
--- a/Libraries/Utilities/truncate.js
+++ b/Libraries/Utilities/truncate.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule truncate
  * @flow
@@ -27,12 +25,16 @@ const defaultOptions = {
 const truncate = function(
   str: ?string,
   maxChars: number,
-  options: truncateOptions
+  options?: truncateOptions
 ): ?string {
   options = Object.assign({}, defaultOptions, options);
   if (str && str.length &&
       str.length - options.minDelta + options.elipsis.length >= maxChars) {
-    str = str.slice(0, maxChars - options.elipsis.length + 1);
+    // If the slice is happening in the middle of a wide char, add one more char
+    var extraChar = str.charCodeAt(maxChars - options.elipsis.length) > 255
+      ? 1
+      : 0;
+    str = str.slice(0, maxChars - options.elipsis.length + 1 + extraChar);
     if (options.breakOnWords) {
       var ii = Math.max(str.lastIndexOf(' '), str.lastIndexOf('\n'));
       str = str.slice(0, ii);
diff --git a/Libraries/Vibration/RCTVibration.h b/Libraries/Vibration/RCTVibration.h
index 935d32669944d3..d1efc147c4aa49 100644
--- a/Libraries/Vibration/RCTVibration.h
+++ b/Libraries/Vibration/RCTVibration.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/Libraries/Vibration/RCTVibration.m b/Libraries/Vibration/RCTVibration.m
index f2544d76790862..3a9e065c585992 100644
--- a/Libraries/Vibration/RCTVibration.m
+++ b/Libraries/Vibration/RCTVibration.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTVibration.h"
diff --git a/Libraries/Vibration/Vibration.js b/Libraries/Vibration/Vibration.js
index b4b54375603002..7f10cda29f8fab 100644
--- a/Libraries/Vibration/Vibration.js
+++ b/Libraries/Vibration/Vibration.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Vibration
  * @flow
@@ -17,7 +15,7 @@ var Platform = require('Platform');
 
 /**
  * Vibration API
- * 
+ *
  * See https://facebook.github.io/react-native/docs/vibration.html
  */
 
@@ -59,7 +57,7 @@ function vibrateScheduler(id, pattern: Array<number>, repeat: boolean, nextIndex
 var Vibration = {
   /**
    * Trigger a vibration with specified `pattern`.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/vibration.html#vibrate
    */
   vibrate: function(pattern: number | Array<number> = 400, repeat: boolean = false) {
@@ -86,7 +84,7 @@ var Vibration = {
   },
   /**
    * Stop vibration
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/vibration.html#cancel
    */
   cancel: function() {
diff --git a/Libraries/Vibration/VibrationIOS.android.js b/Libraries/Vibration/VibrationIOS.android.js
index 37cdf859c1eb8c..0b2279b696ccb5 100644
--- a/Libraries/Vibration/VibrationIOS.android.js
+++ b/Libraries/Vibration/VibrationIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * Stub of VibrationIOS for Android.
  *
diff --git a/Libraries/Vibration/VibrationIOS.ios.js b/Libraries/Vibration/VibrationIOS.ios.js
index 56da5a815b12dc..ec55640442f670 100644
--- a/Libraries/Vibration/VibrationIOS.ios.js
+++ b/Libraries/Vibration/VibrationIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule VibrationIOS
  * @flow
diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.h b/Libraries/WebSocket/RCTReconnectingWebSocket.h
index 7eb8fabb736f71..bcadb3b0ad3241 100644
--- a/Libraries/WebSocket/RCTReconnectingWebSocket.h
+++ b/Libraries/WebSocket/RCTReconnectingWebSocket.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTDefines.h>
diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.m b/Libraries/WebSocket/RCTReconnectingWebSocket.m
index 899120e8e2b8ae..04e5dee57b67e7 100644
--- a/Libraries/WebSocket/RCTReconnectingWebSocket.m
+++ b/Libraries/WebSocket/RCTReconnectingWebSocket.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTReconnectingWebSocket.h"
diff --git a/Libraries/WebSocket/RCTWebSocketExecutor.h b/Libraries/WebSocket/RCTWebSocketExecutor.h
index 733da2adb7cc40..5aa7cdb44635ef 100644
--- a/Libraries/WebSocket/RCTWebSocketExecutor.h
+++ b/Libraries/WebSocket/RCTWebSocketExecutor.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTDefines.h>
diff --git a/Libraries/WebSocket/RCTWebSocketExecutor.m b/Libraries/WebSocket/RCTWebSocketExecutor.m
index 9747730df0d0fc..14f53a43c2daab 100644
--- a/Libraries/WebSocket/RCTWebSocketExecutor.m
+++ b/Libraries/WebSocket/RCTWebSocketExecutor.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTWebSocketExecutor.h"
diff --git a/Libraries/WebSocket/RCTWebSocketModule.h b/Libraries/WebSocket/RCTWebSocketModule.h
index 2875d0eb3a9f3d..18632a9a6fbbad 100644
--- a/Libraries/WebSocket/RCTWebSocketModule.h
+++ b/Libraries/WebSocket/RCTWebSocketModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/Libraries/WebSocket/RCTWebSocketModule.m b/Libraries/WebSocket/RCTWebSocketModule.m
index 90d6180c124f8d..425ff9873643b9 100644
--- a/Libraries/WebSocket/RCTWebSocketModule.m
+++ b/Libraries/WebSocket/RCTWebSocketModule.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTWebSocketModule.h"
diff --git a/Libraries/WebSocket/WebSocket.js b/Libraries/WebSocket/WebSocket.js
index 3a70b3792803d5..13e614557d78b4 100644
--- a/Libraries/WebSocket/WebSocket.js
+++ b/Libraries/WebSocket/WebSocket.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebSocket
  * @flow
diff --git a/Libraries/WebSocket/WebSocketEvent.js b/Libraries/WebSocket/WebSocketEvent.js
index 27ca093bc29d7c..93133902a94a8d 100644
--- a/Libraries/WebSocket/WebSocketEvent.js
+++ b/Libraries/WebSocket/WebSocketEvent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebSocketEvent
  */
diff --git a/Libraries/WebSocket/WebSocketInterceptor.js b/Libraries/WebSocket/WebSocketInterceptor.js
index 3ac649a16219d4..10251dfa1a2045 100644
--- a/Libraries/WebSocket/WebSocketInterceptor.js
+++ b/Libraries/WebSocket/WebSocketInterceptor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebSocketInterceptor
  */
diff --git a/Libraries/WebSocket/__tests__/WebSocket-test.js b/Libraries/WebSocket/__tests__/WebSocket-test.js
index 405cf814cdf2ea..c6e04bf0a6d998 100644
--- a/Libraries/WebSocket/__tests__/WebSocket-test.js
+++ b/Libraries/WebSocket/__tests__/WebSocket-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleView.h b/Libraries/Wrapper/Example/RCTWrapperExampleView.h
index e169368c0fb67c..b7d2aa4aaddf65 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleView.h
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleView.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleView.m b/Libraries/Wrapper/Example/RCTWrapperExampleView.m
index 05494750c96d8e..218eefbac98d0a 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleView.m
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleView.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import "RCTWrapperExampleView.h"
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h
index 2778090a5b68c3..c0a838cf5a5d5a 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
index 0d5473600e7f6f..b49862028019b8 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import "RCTWrapperExampleViewController.h"
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h
index 8b915dcafad47d..0d31356faac7be 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
index acdef85cf94314..c93b2a2076cd64 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import "RCTWrapperReactRootViewController.h"
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h
index 1a6fd506809505..357dea11dc6bd8 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
index 6150453881303d..4fb88e9c1cbdbb 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import "RCTWrapperReactRootViewManager.h"
 
diff --git a/Libraries/Wrapper/RCTWrapper.h b/Libraries/Wrapper/RCTWrapper.h
index 4fa389a03e4e3d..2fff2638542f19 100644
--- a/Libraries/Wrapper/RCTWrapper.h
+++ b/Libraries/Wrapper/RCTWrapper.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/RCTWrapperShadowView.h b/Libraries/Wrapper/RCTWrapperShadowView.h
index 1a64b85d5e54c5..ab7d332eb322dd 100644
--- a/Libraries/Wrapper/RCTWrapperShadowView.h
+++ b/Libraries/Wrapper/RCTWrapperShadowView.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/RCTWrapperShadowView.m b/Libraries/Wrapper/RCTWrapperShadowView.m
index 723ead6177da56..09b1f2eea2c5fd 100644
--- a/Libraries/Wrapper/RCTWrapperShadowView.m
+++ b/Libraries/Wrapper/RCTWrapperShadowView.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import "RCTWrapperShadowView.h"
 
diff --git a/Libraries/Wrapper/RCTWrapperView.h b/Libraries/Wrapper/RCTWrapperView.h
index 0aa6dfc83fe8e9..f6c8599f2a8c62 100644
--- a/Libraries/Wrapper/RCTWrapperView.h
+++ b/Libraries/Wrapper/RCTWrapperView.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/RCTWrapperView.m b/Libraries/Wrapper/RCTWrapperView.m
index 9843c12835a600..483f07f92cdb39 100644
--- a/Libraries/Wrapper/RCTWrapperView.m
+++ b/Libraries/Wrapper/RCTWrapperView.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import "RCTWrapperView.h"
 
diff --git a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h
index cf85e8cab9f62e..d323944bb46b71 100644
--- a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h
+++ b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
index 8503ee88e5e28d..da42a0c4fafde5 100644
--- a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
+++ b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import "RCTWrapperViewControllerHostingView.h"
 
diff --git a/Libraries/Wrapper/RCTWrapperViewManager.h b/Libraries/Wrapper/RCTWrapperViewManager.h
index bdd5d9f40c7be9..ae8dcee5963188 100644
--- a/Libraries/Wrapper/RCTWrapperViewManager.h
+++ b/Libraries/Wrapper/RCTWrapperViewManager.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <React/RCTViewManager.h>
 
diff --git a/Libraries/Wrapper/RCTWrapperViewManager.m b/Libraries/Wrapper/RCTWrapperViewManager.m
index 687c7a46cf3ab8..7058a4d06d6898 100644
--- a/Libraries/Wrapper/RCTWrapperViewManager.m
+++ b/Libraries/Wrapper/RCTWrapperViewManager.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import "RCTWrapperViewManager.h"
 
diff --git a/Libraries/polyfills/Array.es6.js b/Libraries/polyfills/Array.es6.js
index e6621252994e6c..0075d7ae1e070c 100644
--- a/Libraries/polyfills/Array.es6.js
+++ b/Libraries/polyfills/Array.es6.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Array.es6
  * @polyfill
diff --git a/Libraries/polyfills/Array.prototype.es6.js b/Libraries/polyfills/Array.prototype.es6.js
index 67799decae7a09..2bf044144eb7a9 100644
--- a/Libraries/polyfills/Array.prototype.es6.js
+++ b/Libraries/polyfills/Array.prototype.es6.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Array.prototype.es6
  * @polyfill
diff --git a/Libraries/polyfills/Number.es6.js b/Libraries/polyfills/Number.es6.js
index 9323b2d3ef2e9f..ef7d4ac88e4f41 100644
--- a/Libraries/polyfills/Number.es6.js
+++ b/Libraries/polyfills/Number.es6.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Number.es6
  * @polyfill
diff --git a/Libraries/polyfills/Object.es6.js b/Libraries/polyfills/Object.es6.js
index a87a40311e5b2e..0aa884e8be9596 100644
--- a/Libraries/polyfills/Object.es6.js
+++ b/Libraries/polyfills/Object.es6.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Object.es6
  * @polyfill
diff --git a/Libraries/polyfills/Object.es7.js b/Libraries/polyfills/Object.es7.js
index 2147c81d8fc16f..294756b11c3638 100644
--- a/Libraries/polyfills/Object.es7.js
+++ b/Libraries/polyfills/Object.es7.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Object.es7
  * @polyfill
diff --git a/Libraries/polyfills/String.prototype.es6.js b/Libraries/polyfills/String.prototype.es6.js
index 9d9b47c6bd65ef..b3bd95be6b88bc 100644
--- a/Libraries/polyfills/String.prototype.es6.js
+++ b/Libraries/polyfills/String.prototype.es6.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule String.prototype.es6
  * @polyfill
diff --git a/Libraries/polyfills/__tests__/Object.es7-test.js b/Libraries/polyfills/__tests__/Object.es7-test.js
index e8c4746c1d44ee..528a479f3b6b93 100644
--- a/Libraries/polyfills/__tests__/Object.es7-test.js
+++ b/Libraries/polyfills/__tests__/Object.es7-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+jsinfra
  */
diff --git a/Libraries/polyfills/babelHelpers.js b/Libraries/polyfills/babelHelpers.js
index 4965e5529ca230..dfe819464f09c4 100644
--- a/Libraries/polyfills/babelHelpers.js
+++ b/Libraries/polyfills/babelHelpers.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule babelHelpers
  * @polyfill
diff --git a/Libraries/polyfills/console.js b/Libraries/polyfills/console.js
index 0564491afb33dd..37a92b1a62fe1f 100644
--- a/Libraries/polyfills/console.js
+++ b/Libraries/polyfills/console.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule console
  * @polyfill
diff --git a/Libraries/polyfills/error-guard.js b/Libraries/polyfills/error-guard.js
index 24433346f92c80..632e7e0e4f02d6 100644
--- a/Libraries/polyfills/error-guard.js
+++ b/Libraries/polyfills/error-guard.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule error-guard
  * @polyfill
diff --git a/Libraries/promiseRejectionIsError.js b/Libraries/promiseRejectionIsError.js
index 60d1a0032950d1..ce3ee915cff47f 100644
--- a/Libraries/promiseRejectionIsError.js
+++ b/Libraries/promiseRejectionIsError.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule promiseRejectionIsError
  * @flow
diff --git a/Libraries/react-native/React.js b/Libraries/react-native/React.js
index ba075690bf5ff8..f000f1403b5d6a 100644
--- a/Libraries/react-native/React.js
+++ b/Libraries/react-native/React.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule React
  */
diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js
index 577a896cd7258d..200409bcbc041b 100644
--- a/Libraries/react-native/react-native-implementation.js
+++ b/Libraries/react-native/react-native-implementation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule react-native-implementation
  * @flow
diff --git a/Libraries/react-native/react-native-interface.js b/Libraries/react-native/react-native-interface.js
index 764952ff8915cf..fd4ad545c31b10 100644
--- a/Libraries/react-native/react-native-interface.js
+++ b/Libraries/react-native/react-native-interface.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule react-native-interface
diff --git a/Libraries/vendor/core/ErrorUtils.js b/Libraries/vendor/core/ErrorUtils.js
index eed9a06d6ae982..8b36c611105d0e 100644
--- a/Libraries/vendor/core/ErrorUtils.js
+++ b/Libraries/vendor/core/ErrorUtils.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ErrorUtils
  * @flow
diff --git a/Libraries/vendor/core/Map.js b/Libraries/vendor/core/Map.js
index 7d708657122fa8..e9e687a15ce99e 100644
--- a/Libraries/vendor/core/Map.js
+++ b/Libraries/vendor/core/Map.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Map
  * @preventMunge
diff --git a/Libraries/vendor/core/Set.js b/Libraries/vendor/core/Set.js
index 658722b6cf0b36..b43313205ef7e3 100644
--- a/Libraries/vendor/core/Set.js
+++ b/Libraries/vendor/core/Set.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Set
  * @preventMunge
diff --git a/Libraries/vendor/core/_shouldPolyfillES6Collection.js b/Libraries/vendor/core/_shouldPolyfillES6Collection.js
index 80222a94735438..e3f77b169dece5 100644
--- a/Libraries/vendor/core/_shouldPolyfillES6Collection.js
+++ b/Libraries/vendor/core/_shouldPolyfillES6Collection.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule _shouldPolyfillES6Collection
  * @preventMunge
diff --git a/Libraries/vendor/core/getObjectValues.js b/Libraries/vendor/core/getObjectValues.js
index 732313dc11bf63..aac327c2eaed9d 100644
--- a/Libraries/vendor/core/getObjectValues.js
+++ b/Libraries/vendor/core/getObjectValues.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule getObjectValues
  * @typechecks
diff --git a/Libraries/vendor/core/guid.js b/Libraries/vendor/core/guid.js
index cf6e4d584957cb..74c97cf383de1f 100644
--- a/Libraries/vendor/core/guid.js
+++ b/Libraries/vendor/core/guid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule guid
  */
diff --git a/Libraries/vendor/core/isEmpty.js b/Libraries/vendor/core/isEmpty.js
index 301efef721db50..1f55d4519ff3af 100644
--- a/Libraries/vendor/core/isEmpty.js
+++ b/Libraries/vendor/core/isEmpty.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule isEmpty
  */
diff --git a/Libraries/vendor/core/mergeHelpers.js b/Libraries/vendor/core/mergeHelpers.js
index d021e2ffc93443..4eb2d9d2aec8f1 100644
--- a/Libraries/vendor/core/mergeHelpers.js
+++ b/Libraries/vendor/core/mergeHelpers.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule mergeHelpers
  *
diff --git a/Libraries/vendor/core/toIterator.js b/Libraries/vendor/core/toIterator.js
index ce28f94a3032be..b396c469c03f3e 100644
--- a/Libraries/vendor/core/toIterator.js
+++ b/Libraries/vendor/core/toIterator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule toIterator
  */
diff --git a/Libraries/vendor/document/selection/DocumentSelectionState.js b/Libraries/vendor/document/selection/DocumentSelectionState.js
index fbfcc3062302cc..a702582c6965d0 100644
--- a/Libraries/vendor/document/selection/DocumentSelectionState.js
+++ b/Libraries/vendor/document/selection/DocumentSelectionState.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DocumentSelectionState
  * @typechecks
diff --git a/Libraries/vendor/emitter/EmitterSubscription.js b/Libraries/vendor/emitter/EmitterSubscription.js
index 93c1ee376eb74c..e352e71675c9b9 100644
--- a/Libraries/vendor/emitter/EmitterSubscription.js
+++ b/Libraries/vendor/emitter/EmitterSubscription.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EmitterSubscription
  * @flow
diff --git a/Libraries/vendor/emitter/EventEmitter.js b/Libraries/vendor/emitter/EventEmitter.js
index 5f981ceeb1b103..4fdb10a051593a 100644
--- a/Libraries/vendor/emitter/EventEmitter.js
+++ b/Libraries/vendor/emitter/EventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventEmitter
  * @noflow
diff --git a/Libraries/vendor/emitter/EventEmitterWithHolding.js b/Libraries/vendor/emitter/EventEmitterWithHolding.js
index a74d37c01681b0..8c082222e8f73f 100644
--- a/Libraries/vendor/emitter/EventEmitterWithHolding.js
+++ b/Libraries/vendor/emitter/EventEmitterWithHolding.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventEmitterWithHolding
  * @flow
diff --git a/Libraries/vendor/emitter/EventHolder.js b/Libraries/vendor/emitter/EventHolder.js
index 8957ad5cce4204..3bb7062e020f6a 100644
--- a/Libraries/vendor/emitter/EventHolder.js
+++ b/Libraries/vendor/emitter/EventHolder.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventHolder
  * @flow
diff --git a/Libraries/vendor/emitter/EventSubscription.js b/Libraries/vendor/emitter/EventSubscription.js
index 955a234ecbf976..82cb06fc4fd556 100644
--- a/Libraries/vendor/emitter/EventSubscription.js
+++ b/Libraries/vendor/emitter/EventSubscription.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventSubscription
  * @flow
diff --git a/Libraries/vendor/emitter/EventSubscriptionVendor.js b/Libraries/vendor/emitter/EventSubscriptionVendor.js
index 7078766a01b4c9..aa2a4e76b90b21 100644
--- a/Libraries/vendor/emitter/EventSubscriptionVendor.js
+++ b/Libraries/vendor/emitter/EventSubscriptionVendor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventSubscriptionVendor
  * @flow
diff --git a/Libraries/vendor/emitter/EventValidator.js b/Libraries/vendor/emitter/EventValidator.js
index 6671c17c1061ca..9930236776b210 100644
--- a/Libraries/vendor/emitter/EventValidator.js
+++ b/Libraries/vendor/emitter/EventValidator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventValidator
  * @flow
diff --git a/Libraries/vendor/emitter/mixInEventEmitter.js b/Libraries/vendor/emitter/mixInEventEmitter.js
index b8693f055b4b19..6ee08d6d31acb0 100644
--- a/Libraries/vendor/emitter/mixInEventEmitter.js
+++ b/Libraries/vendor/emitter/mixInEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule mixInEventEmitter
  * @flow
diff --git a/PATENTS b/PATENTS
deleted file mode 100644
index f26186660aa7b0..00000000000000
--- a/PATENTS
+++ /dev/null
@@ -1,33 +0,0 @@
-Additional Grant of Patent Rights Version 2
-
-"Software" means the React Native software distributed by Facebook, Inc.
-
-Facebook, Inc. (“Facebook”) hereby grants to each recipient of the Software
-(“you”) a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
-(subject to the termination provision below) license under any Necessary
-Claims, to make, have made, use, sell, offer to sell, import, and otherwise
-transfer the Software. For avoidance of doubt, no license is granted under
-Facebook's rights in any patent claims that are infringed by (i) modifications
-to the Software made by you or any third party or (ii) the Software in
-combination with any software or other technology.
-
-The license granted hereunder will terminate, automatically and without notice,
-if you (or any of your subsidiaries, corporate affiliates or agents) initiate
-directly or indirectly, or take a direct financial interest in, any Patent
-Assertion: (i) against Facebook or any of its subsidiaries or corporate
-affiliates, (ii) against any party if such Patent Assertion arises in whole or
-in part from any software, technology, product or service of Facebook or any of
-its subsidiaries or corporate affiliates, or (iii) against any party relating
-to the Software. Notwithstanding the foregoing, if Facebook or any of its
-subsidiaries or corporate affiliates files a lawsuit alleging patent
-infringement against you in the first instance, and you respond by filing a
-patent infringement counterclaim in that lawsuit against that party that is
-unrelated to the Software, the license granted hereunder will not terminate
-under section (i) of this paragraph due to such counterclaim.
-
-A "Necessary Claim" is a claim of a patent owned by Facebook that is
-necessarily infringed by the Software standing alone.
-
-A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
-or contributory infringement or inducement to infringe any patent, including a
-cross-claim or counterclaim.
diff --git a/README.md b/README.md
index 05aafba3ca7806..a9c12562f1a698 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ We have a list of [beginner friendly issues](https://github.com/facebook/react-n
 
 ## License
 
-React Native is [BSD licensed](./LICENSE). We also provide an additional [patent grant](./PATENTS).
+React Native is [MIT licensed](./LICENSE).
 
 React Native documentation is [Creative Commons licensed](./LICENSE-docs).
 
diff --git a/RNTester/.eslintrc b/RNTester/.eslintrc
deleted file mode 100644
index ddcf4e27251d8f..00000000000000
--- a/RNTester/.eslintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "rules": {
-    // This folder currently runs through babel and doesn't need to be
-    // compatible with node 4
-    "comma-dangle": 0
-  }
-}
diff --git a/RNTester/RNTester.xcodeproj/project.pbxproj b/RNTester/RNTester.xcodeproj/project.pbxproj
index 84c137c7e40cf9..d8a883ae56370e 100644
--- a/RNTester/RNTester.xcodeproj/project.pbxproj
+++ b/RNTester/RNTester.xcodeproj/project.pbxproj
@@ -889,13 +889,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		19BA89021F8439A700741C5A /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		272E6B3A1BEA846C001FCF37 /* NativeExampleViews */ = {
 			isa = PBXGroup;
 			children = (
@@ -1157,6 +1150,9 @@
 					004D289D1AAF61C70097A701 = {
 						CreatedOnToolsVersion = 6.1.1;
 					};
+					13B07F861A680F5B00A75B9A = {
+						DevelopmentTeam = V9WTTPBFK9;
+					};
 					143BC5941B21E3E100462512 = {
 						CreatedOnToolsVersion = 6.3.2;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
@@ -1854,6 +1850,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
diff --git a/RNTester/RNTester/AppDelegate.h b/RNTester/RNTester/AppDelegate.h
index 64cd15e5ae4885..f74364db7052d7 100644
--- a/RNTester/RNTester/AppDelegate.h
+++ b/RNTester/RNTester/AppDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/AppDelegate.m b/RNTester/RNTester/AppDelegate.m
index 55b9ab5f7648ab..d1e3548a75cc7a 100644
--- a/RNTester/RNTester/AppDelegate.m
+++ b/RNTester/RNTester/AppDelegate.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h
index 1073b2809a3b91..bca55cd86b72c0 100644
--- a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h
+++ b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m
index 08e519fc58a78b..dacb4f9ec25435 100644
--- a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m
+++ b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h
index 10d3ad9e76b2f4..9ca7e89c23a6ab 100644
--- a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h
+++ b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m
index c8ddfb1fbe7d10..083f0e538ad3f8 100644
--- a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m
+++ b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/main.m b/RNTester/RNTester/main.m
index 71f040ff1a0728..4094e2a9143067 100644
--- a/RNTester/RNTester/main.m
+++ b/RNTester/RNTester/main.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m b/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m
index 4f23baf0470dab..b93b96337f9b47 100644
--- a/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m
+++ b/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m b/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
index fc015278359fdd..18007b0cf0efbd 100644
--- a/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
+++ b/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m b/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m
index 4e23f431ff8cc7..d91c489211bdc4 100644
--- a/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m
+++ b/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m b/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
index 005d0e899ee371..5f432ec0580dff 100644
--- a/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
+++ b/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m b/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
index 2e9afbd3d0bd58..12c7599744b253 100644
--- a/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
+++ b/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m b/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m
index a5099f1a4a1876..a6aaaca8c0c753 100644
--- a/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m
+++ b/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS10@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS10@2x.png
index 66c1403e18a001..17e31df9f64946 100644
Binary files a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS10@2x.png and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS10@2x.png differ
diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS11@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS11@2x.png
index 238678f04960a2..c2a8c38ec4c2c7 100644
Binary files a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS11@2x.png and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS11@2x.png differ
diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1@2x.png
index 7c79f2bcf1f8ee..94e0a287d297db 100644
Binary files a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1@2x.png and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1@2x.png differ
diff --git a/RNTester/RNTesterUnitTests/RCTAllocationTests.m b/RNTester/RNTesterUnitTests/RCTAllocationTests.m
index cef41707f687ca..bb100f71c5aeee 100644
--- a/RNTester/RNTesterUnitTests/RCTAllocationTests.m
+++ b/RNTester/RNTesterUnitTests/RCTAllocationTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m b/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m
index bd60019dd5477e..acd729c0b59f15 100644
--- a/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m
+++ b/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m b/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m
index 892a5f76f17d4e..cffde57aa4d796 100644
--- a/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m
+++ b/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m b/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m
index e25a9a83f64c69..bc48eebfc37884 100644
--- a/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m
+++ b/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 #import <XCTest/XCTest.h>
diff --git a/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m b/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m
index 759c2e3b42281f..fd9fdf7e8bb8fb 100644
--- a/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m
+++ b/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m b/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m
index 8c6a1ec170b875..830bebb27f564a 100644
--- a/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m
+++ b/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m b/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m
index 6ce63ecf070392..a12f525f288e22 100644
--- a/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m
+++ b/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTDevMenuTests.m b/RNTester/RNTesterUnitTests/RCTDevMenuTests.m
index fd67246ce5a222..9dc5112a5b080e 100644
--- a/RNTester/RNTesterUnitTests/RCTDevMenuTests.m
+++ b/RNTester/RNTesterUnitTests/RCTDevMenuTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m b/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m
index f58fd45ac0e55a..d057aae878a4b7 100644
--- a/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m
+++ b/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTFontTests.m b/RNTester/RNTesterUnitTests/RCTFontTests.m
index 148a0bcf7a1536..1d9573b489e1b2 100644
--- a/RNTester/RNTesterUnitTests/RCTFontTests.m
+++ b/RNTester/RNTesterUnitTests/RCTFontTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTGzipTests.m b/RNTester/RNTesterUnitTests/RCTGzipTests.m
index e15742d94d0fae..ea91bac8ffb4f3 100644
--- a/RNTester/RNTesterUnitTests/RCTGzipTests.m
+++ b/RNTester/RNTesterUnitTests/RCTGzipTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h
index da8c03fd859c8b..116aafcc7d8d96 100644
--- a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h
+++ b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m
index ef0661b2f6ea91..25178917b5130a 100644
--- a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m
+++ b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m b/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m
index 2f20a0504b84b0..b17ed4bcd3c9e9 100644
--- a/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m
+++ b/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTImageUtilTests.m b/RNTester/RNTesterUnitTests/RCTImageUtilTests.m
index e5aa49f43634a2..b160fca59913f0 100644
--- a/RNTester/RNTesterUnitTests/RCTImageUtilTests.m
+++ b/RNTester/RNTesterUnitTests/RCTImageUtilTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTJSONTests.m b/RNTester/RNTesterUnitTests/RCTJSONTests.m
index 5eaa9655c76184..dce9b1013f8843 100644
--- a/RNTester/RNTesterUnitTests/RCTJSONTests.m
+++ b/RNTester/RNTesterUnitTests/RCTJSONTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m b/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
index ee36570e9104c4..268b7366de5d42 100644
--- a/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
+++ b/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m b/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
index df90f2a872d31e..ca5b1c7ef6207e 100644
--- a/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
+++ b/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTModuleInitTests.m b/RNTester/RNTesterUnitTests/RCTModuleInitTests.m
index aaae1dc1ea488e..1942d824aa1b99 100644
--- a/RNTester/RNTesterUnitTests/RCTModuleInitTests.m
+++ b/RNTester/RNTesterUnitTests/RCTModuleInitTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm b/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm
index 7abcd37aaf170f..4fa8012d9d4b47 100644
--- a/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm
+++ b/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m b/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m
index c92a505a9ec8fa..8d8de7cf0076ba 100644
--- a/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m
+++ b/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m b/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
index 70678ac2854269..efe0b952789622 100644
--- a/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
+++ b/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
@@ -865,4 +863,227 @@ - (void)testNativeAnimatedEventDoNotUpdate
   [_uiManager verify];
 }
 
+/**
+ * Creates a following graph of nodes:
+ * Value(3, initialValue) ----> Style(4) ---> Props(5) ---> View(viewTag)
+ *
+ * Value(3) is set to track Value(1) via Tracking(2) node with the provided animation config
+ */
+- (void)createAnimatedGraphWithTrackingNode:(NSNumber *)viewTag
+                               initialValue:(CGFloat)initialValue
+                            animationConfig:(NSDictionary *)animationConfig
+{
+  [_nodesManager createAnimatedNode:@1
+                             config:@{@"type": @"value", @"value": @(initialValue), @"offset": @0}];
+  [_nodesManager createAnimatedNode:@3
+                             config:@{@"type": @"value", @"value": @(initialValue), @"offset": @0}];
+
+  [_nodesManager createAnimatedNode:@2
+                             config:@{@"type": @"tracking",
+                                      @"animationId": @70,
+                                      @"value": @3,
+                                      @"toValue": @1,
+                                      @"animationConfig": animationConfig}];
+  [_nodesManager createAnimatedNode:@4
+                             config:@{@"type": @"style", @"style": @{@"translateX": @3}}];
+  [_nodesManager createAnimatedNode:@5
+                             config:@{@"type": @"props", @"props": @{@"style": @4}}];
+
+  [_nodesManager connectAnimatedNodes:@1 childTag:@2];
+  [_nodesManager connectAnimatedNodes:@3 childTag:@4];
+  [_nodesManager connectAnimatedNodes:@4 childTag:@5];
+  [_nodesManager connectAnimatedNodeToView:@5 viewTag:viewTag viewName:@"UIView"];
+}
+
+/**
+ * In this test we verify that when value is being tracked we can update destination value in the
+ * middle of ongoing animation and the animation will update and animate to the new spot. This is
+ * tested using simple 5 frame backed timing animation.
+ */
+- (void)testTracking
+{
+  NSArray *frames = @[@0, @0.25, @0.5, @0.75, @1];
+  NSDictionary *animationConfig = @{@"type": @"frames", @"frames": frames};
+  [self createAnimatedGraphWithTrackingNode:@1000 initialValue:0 animationConfig:animationConfig];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:@1000
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", 0)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  // update "toValue" to 100, we expect tracking animation to animate now from 0 to 100 in 5 steps
+  [_nodesManager setAnimatedNodeValue:@1 value:@100];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  for (NSNumber *frame in frames) {
+    NSNumber *expected = @([frame doubleValue] * 100);
+    [[_uiManager expect] synchronouslyUpdateViewOnUIThread:@1000
+                                                  viewName:@"UIView"
+                                                     props:RCTPropChecker(@"translateX", expected)];
+    [_nodesManager stepAnimations:_displayLink];
+    [_uiManager verify];
+  }
+
+  // update "toValue" to 0 but run only two frames from the animation,
+  // we expect tracking animation to animate now from 100 to 75
+  [_nodesManager setAnimatedNodeValue:@1 value:@0];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  for (int i = 0; i < 2; i++) {
+    NSNumber *expected = @(100. * (1. - [frames[i] doubleValue]));
+    [[_uiManager expect] synchronouslyUpdateViewOnUIThread:@1000
+                                                  viewName:@"UIView"
+                                                     props:RCTPropChecker(@"translateX", expected)];
+    [_nodesManager stepAnimations:_displayLink];
+    [_uiManager verify];
+  }
+
+  // at this point we expect tracking value to be at 75
+  // we update "toValue" again to 100 and expect the animation to restart from the current place
+  [_nodesManager setAnimatedNodeValue:@1 value:@100];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  for (NSNumber *frame in frames) {
+    NSNumber *expected = @(50. + 50. * [frame doubleValue]);
+    [[_uiManager expect] synchronouslyUpdateViewOnUIThread:@1000
+                                                  viewName:@"UIView"
+                                                     props:RCTPropChecker(@"translateX", expected)];
+    [_nodesManager stepAnimations:_displayLink];
+    [_uiManager verify];
+  }
+
+  [_nodesManager stepAnimations:_displayLink];
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+/**
+ * In this test we verify that when tracking is set up for a given animated node and when the
+ * animation settles it will not be registered as an active animation and therefore will not
+ * consume resources on running the animation that has already completed. Then we verify that when
+ * the value updates the animation will resume as expected and the complete again when reaches the
+ * end.
+ */
+
+ - (void)testTrackingPausesWhenEndValueIsReached
+{
+  NSArray *frames = @[@0, @0.5, @1];
+  NSDictionary *animationConfig = @{@"type": @"frames", @"frames": frames};
+  [self createAnimatedGraphWithTrackingNode:@1000 initialValue:0 animationConfig:animationConfig];
+
+  [_nodesManager setAnimatedNodeValue:@1 value:@100];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  __block int callCount = 0;
+  [[[_uiManager stub] andDo:^(NSInvocation* __unused invocation) {
+    callCount++;
+  }] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+
+  for (NSUInteger i = 0; i < frames.count; i++) {
+    [_nodesManager stepAnimations:_displayLink];
+  }
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(callCount, 4);
+
+  // the animation has completed, we expect no updates to be done
+  [[[_uiManager stub] andDo:^(NSInvocation* __unused invocation) {
+    XCTFail("Expected not to be called");
+  }] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  // restore rejected method, we will use it later on
+  callCount = 0;
+  [[[_uiManager stub] andDo:^(NSInvocation* __unused invocation) {
+    callCount++;
+  }] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+
+  // we update end value and expect the animation to restart
+  [_nodesManager setAnimatedNodeValue:@1 value:@200];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  for (NSUInteger i = 0; i < frames.count; i++) {
+    [_nodesManager stepAnimations:_displayLink];
+  }
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(callCount, 4);
+
+  // the animation has completed, we expect no updates to be done
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+/**
+ * In this test we verify that when tracking is configured to use spring animation and when the
+ * destination value updates the current speed of the animated value will be taken into account
+ * while updating the spring animation and it will smoothly transition to the new end value.
+ */
+- (void) testSpringTrackingRetainsSpeed
+{
+  // this spring config correspomds to tension 20 and friction 0.5 which makes the spring settle
+  // very slowly
+  NSDictionary *springConfig = @{@"type": @"spring",
+                                 @"restSpeedThreshold": @0.001,
+                                 @"mass": @1,
+                                 @"restDisplacementThreshold": @0.001,
+                                 @"initialVelocity": @0.5,
+                                 @"damping": @2.5,
+                                 @"stiffness": @157.8,
+                                 @"overshootClamping": @NO};
+  [self createAnimatedGraphWithTrackingNode:@1000 initialValue:0 animationConfig:springConfig];
+
+  __block CGFloat lastTranslateX = 0;
+  [[[_uiManager stub] andDo:^(NSInvocation *invocation) {
+    __unsafe_unretained NSDictionary *props = nil;
+    [invocation getArgument:&props atIndex:4];
+    lastTranslateX = [props[@"translateX"] doubleValue];
+  }] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+
+  // update "toValue" to 1, we expect tracking animation to animate now from 0 to 1
+  [_nodesManager setAnimatedNodeValue:@1 value:@1];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  // we run several steps of animation until the value starts bouncing, has negative speed and
+  // passes the final point (that is 1) while going backwards
+  BOOL isBoucingBack = NO;
+  CGFloat previousValue = 0;
+  for (int maxFrames = 500; maxFrames > 0; maxFrames--) {
+    [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+    if (previousValue >= 1. && lastTranslateX < 1.) {
+      isBoucingBack = YES;
+      break;
+    }
+    previousValue = lastTranslateX;
+  }
+  XCTAssert(isBoucingBack);
+
+  // we now update "toValue" to 1.5 but since the value have negative speed and has also pretty
+  // low friction we expect it to keep going in the opposite direction for a few more frames
+  [_nodesManager setAnimatedNodeValue:@1 value:@1.5];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  int bounceBackInitialFrames = 0;
+  BOOL hasTurnedForward = NO;
+
+  // we run 8 seconds of animation
+  for (int i = 0; i < 8 * 60; i++) {
+    [_nodesManager stepAnimations:_displayLink];
+    if (!hasTurnedForward) {
+      if (lastTranslateX <= previousValue) {
+        bounceBackInitialFrames++;
+      } else {
+        hasTurnedForward = true;
+      }
+    }
+    previousValue = lastTranslateX;
+  }
+  XCTAssert(hasTurnedForward);
+  XCTAssertGreaterThan(bounceBackInitialFrames, 3);
+  XCTAssertEqual(lastTranslateX, 1.5);
+}
+
 @end
diff --git a/RNTester/RNTesterUnitTests/RCTShadowViewTests.m b/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
index c00922e41808f5..a8b41780224cf5 100644
--- a/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
+++ b/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
@@ -88,7 +86,7 @@ - (void)testApplyingLayoutRecursivelyToShadowView
   [self.parentView insertReactSubview:mainView atIndex:1];
   [self.parentView insertReactSubview:footerView atIndex:2];
 
-  [self.parentView collectViewsWithUpdatedFrames];
+  [self.parentView layoutWithAffectedShadowViews:[NSHashTable weakObjectsHashTable]];
 
   XCTAssertTrue(CGRectEqualToRect([self.parentView measureLayoutRelativeToAncestor:self.parentView], CGRectMake(0, 0, 440, 440)));
   XCTAssertTrue(UIEdgeInsetsEqualToEdgeInsets([self.parentView paddingAsInsets], UIEdgeInsetsMake(10, 10, 10, 10)));
@@ -180,7 +178,7 @@ - (void)_withShadowViewWithStyle:(void(^)(YGNodeRef node))configBlock
   RCTShadowView *view = [self _shadowViewWithConfig:configBlock];
   [self.parentView insertReactSubview:view atIndex:0];
   view.intrinsicContentSize = contentSize;
-  [self.parentView collectViewsWithUpdatedFrames];
+  [self.parentView layoutWithAffectedShadowViews:[NSHashTable weakObjectsHashTable]];
   CGRect actualRect = [view measureLayoutRelativeToAncestor:self.parentView];
   XCTAssertTrue(CGRectEqualToRect(expectedRect, actualRect),
                 @"Expected layout to be %@, got %@",
diff --git a/RNTester/RNTesterUnitTests/RCTUIManagerTests.m b/RNTester/RNTesterUnitTests/RCTUIManagerTests.m
index 7dd21446ec4c79..bfa0be867b6451 100644
--- a/RNTester/RNTesterUnitTests/RCTUIManagerTests.m
+++ b/RNTester/RNTesterUnitTests/RCTUIManagerTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m b/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m
index 93b2601c5cbf20..aeff07fefa0378 100644
--- a/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m
+++ b/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m b/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m
index 38d614e1f47a6b..02f217e0fe3584 100644
--- a/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m
+++ b/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js b/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js
index 603e784c8aa874..f0a455ff355294 100644
--- a/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js
+++ b/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterUnitTestsBundle
  */
diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle
index 9e55d12326f023..95d02acb788a99 100644
--- a/RNTester/android/app/build.gradle
+++ b/RNTester/android/app/build.gradle
@@ -64,7 +64,7 @@ project.ext.react = [
     inputExcludes: ["android/**", "./**"]
 ]
 
-apply from: "react.gradle"
+apply from: "../../../react.gradle"
 
 /**
  * Set this to true to create three separate APKs instead of one:
diff --git a/RNTester/android/app/react.gradle b/RNTester/android/app/react.gradle
deleted file mode 100644
index c0dca024c8dfac..00000000000000
--- a/RNTester/android/app/react.gradle
+++ /dev/null
@@ -1,96 +0,0 @@
-import org.apache.tools.ant.taskdefs.condition.Os
-
-def config = project.hasProperty("react") ? project.react : [];
-
-def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
-def entryFile = config.entryFile ?: "index.android.js"
-
-// because elvis operator
-def elvisFile(thing) {
-    return thing ? file(thing) : null;
-}
-
-def reactRoot = elvisFile(config.root) ?: file("../../")
-def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
-
-void runBefore(String dependentTaskName, Task task) {
-    Task dependentTask = tasks.findByPath(dependentTaskName);
-    if (dependentTask != null) {
-        dependentTask.dependsOn task
-    }
-}
-
-gradle.projectsEvaluated {
-    // Grab all build types and product flavors
-    def buildTypes = android.buildTypes.collect { type -> type.name }
-    def productFlavors = android.productFlavors.collect { flavor -> flavor.name }
-
-    // When no product flavors defined, use empty
-    if (!productFlavors) productFlavors.add('')
-
-    productFlavors.each { productFlavorName ->
-        buildTypes.each { buildTypeName ->
-            // Create variant and source names
-            def sourceName = "${buildTypeName}"
-            def targetName = "${sourceName.capitalize()}"
-            if (productFlavorName) {
-                sourceName = "${productFlavorName}${targetName}"
-            }
-
-            // React js bundle directories
-            def jsBundleDirConfigName = "jsBundleDir${targetName}"
-            def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
-                    file("$buildDir/intermediates/assets/${sourceName}")
-
-            def resourcesDirConfigName = "jsBundleDir${targetName}"
-            def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
-                    file("$buildDir/intermediates/res/merged/${sourceName}")
-            def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
-
-            // Bundle task name for variant
-            def bundleJsAndAssetsTaskName = "bundle${targetName}JsAndAssets"
-
-            def currentBundleTask = tasks.create(
-                    name: bundleJsAndAssetsTaskName,
-                    type: Exec) {
-                group = "react"
-                description = "bundle JS and assets for ${targetName}."
-
-                // Create dirs if they are not there (e.g. the "clean" task just ran)
-                doFirst {
-                    jsBundleDir.mkdirs()
-                    resourcesDir.mkdirs()
-                }
-
-                // Set up inputs and outputs so gradle can cache the result
-                inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
-                outputs.dir jsBundleDir
-                outputs.dir resourcesDir
-
-                // Set up the call to the react-native cli
-                workingDir reactRoot
-
-                // Set up dev mode
-                def devEnabled = !targetName.toLowerCase().contains("release")
-                if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                    commandLine "cmd", "/c", "node", "./local-cli/cli.js", "bundle", "--platform", "android", "--dev", "${devEnabled}",
-                            "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir
-                } else {
-                    commandLine "node", "./local-cli/cli.js", "bundle", "--platform", "android", "--dev", "${devEnabled}",
-                            "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir
-                }
-
-                enabled config."bundleIn${targetName}" ?: targetName.toLowerCase().contains("release")
-            }
-
-            // Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process
-            currentBundleTask.dependsOn("merge${targetName}Resources")
-            currentBundleTask.dependsOn("merge${targetName}Assets")
-
-            runBefore("processArmeabi-v7a${targetName}Resources", currentBundleTask)
-            runBefore("processX86${targetName}Resources", currentBundleTask)
-            runBefore("processUniversal${targetName}Resources", currentBundleTask)
-            runBefore("process${targetName}Resources", currentBundleTask)
-        }
-    }
-}
diff --git a/RNTester/android/app/src/main/AndroidManifest.xml b/RNTester/android/app/src/main/AndroidManifest.xml
index 818cdd422d54e7..0bde8735a3a8b2 100644
--- a/RNTester/android/app/src/main/AndroidManifest.xml
+++ b/RNTester/android/app/src/main/AndroidManifest.xml
@@ -20,9 +20,14 @@
     android:minSdkVersion="16"
     android:targetSdkVersion="23" />
 
+  <!--
+  android:icon is used to display launcher icon on mobile devices.
+  android:banner is used to display a rectangular banned launcher icon on Android TV devices.
+  -->
   <application
       android:name=".RNTesterApplication"
       android:allowBackup="true"
+      android:banner="@drawable/tv_banner"
       android:icon="@drawable/launcher_icon"
       android:label="@string/app_name"
       android:theme="@style/Theme.ReactNative.AppCompat.Light" >
@@ -34,6 +39,8 @@
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
+        <!-- Needed to properly create a launch intent when running on Android TV -->
+        <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
       </intent-filter>
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
index 2c707b160eac65..5b55c3b26e5e12 100644
--- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
+++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
index 9c943204224375..b8c61a384ac443 100644
--- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
+++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/android/app/src/main/res/drawable/tv_banner.png b/RNTester/android/app/src/main/res/drawable/tv_banner.png
new file mode 100644
index 00000000000000..d67884677f12f9
Binary files /dev/null and b/RNTester/android/app/src/main/res/drawable/tv_banner.png differ
diff --git a/RNTester/js/ARTExample.js b/RNTester/js/ARTExample.js
index 95aa4e8bc534d7..704a9c06bbdc3e 100644
--- a/RNTester/js/ARTExample.js
+++ b/RNTester/js/ARTExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ARTExample
diff --git a/RNTester/js/AccessibilityAndroidExample.android.js b/RNTester/js/AccessibilityAndroidExample.android.js
index 2567fd54886e5a..54b087fa207fdf 100644
--- a/RNTester/js/AccessibilityAndroidExample.android.js
+++ b/RNTester/js/AccessibilityAndroidExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AccessibilityAndroidExample
  */
diff --git a/RNTester/js/AccessibilityIOSExample.js b/RNTester/js/AccessibilityIOSExample.js
index 30aef0df31eaaa..0deead7538d62e 100644
--- a/RNTester/js/AccessibilityIOSExample.js
+++ b/RNTester/js/AccessibilityIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AccessibilityIOSExample
diff --git a/RNTester/js/ActionSheetIOSExample.js b/RNTester/js/ActionSheetIOSExample.js
index a4b7ea07d4d1a8..ac9d9737863780 100644
--- a/RNTester/js/ActionSheetIOSExample.js
+++ b/RNTester/js/ActionSheetIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ActionSheetIOSExample
diff --git a/RNTester/js/ActivityIndicatorExample.js b/RNTester/js/ActivityIndicatorExample.js
index 5daaf362155eb2..692acd01c7d167 100644
--- a/RNTester/js/ActivityIndicatorExample.js
+++ b/RNTester/js/ActivityIndicatorExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ActivityIndicatorExample
diff --git a/RNTester/js/AlertExample.js b/RNTester/js/AlertExample.js
index 8e1062ab2a625b..93c82e4069c9f3 100644
--- a/RNTester/js/AlertExample.js
+++ b/RNTester/js/AlertExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AlertExample
  */
diff --git a/RNTester/js/AlertIOSExample.js b/RNTester/js/AlertIOSExample.js
index fdd1d6a31bf02c..b8b1cee43f85f7 100644
--- a/RNTester/js/AlertIOSExample.js
+++ b/RNTester/js/AlertIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AlertIOSExample
diff --git a/RNTester/js/AnimatedExample.js b/RNTester/js/AnimatedExample.js
index 9e9fbffd1ddd42..8130a9d9f62908 100644
--- a/RNTester/js/AnimatedExample.js
+++ b/RNTester/js/AnimatedExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AnimatedExample
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExApp.js b/RNTester/js/AnimatedGratuitousApp/AnExApp.js
index 268a409faeb068..1116a84ee98254 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExApp.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExApp
  * @flow
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExBobble.js b/RNTester/js/AnimatedGratuitousApp/AnExBobble.js
index 88667a2cae0fdb..d3f8885275eb91 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExBobble.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExBobble.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExBobble
  * @flow
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExChained.js b/RNTester/js/AnimatedGratuitousApp/AnExChained.js
index 124ed34e23a685..63a83804ed34c9 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExChained.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExChained.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExChained
  * @flow
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExScroll.js b/RNTester/js/AnimatedGratuitousApp/AnExScroll.js
index 855580a9339268..b7f69425437fdf 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExScroll.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExScroll.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExScroll
  * @flow
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExSet.js b/RNTester/js/AnimatedGratuitousApp/AnExSet.js
index e3ea2acff32a46..a89fd2008a3f04 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExSet.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExSet.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExSet
  * @flow
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExTilt.js b/RNTester/js/AnimatedGratuitousApp/AnExTilt.js
index 53e7c87e58dba2..a5678b6865073c 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExTilt.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExTilt.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExTilt
  * @flow
diff --git a/RNTester/js/AppStateExample.js b/RNTester/js/AppStateExample.js
index 7a64197b1c8576..8088d77fc06f37 100644
--- a/RNTester/js/AppStateExample.js
+++ b/RNTester/js/AppStateExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AppStateExample
  * @flow
diff --git a/RNTester/js/AssetScaledImageExample.js b/RNTester/js/AssetScaledImageExample.js
index 05f32d22a7e8e0..b723d8f50ea588 100644
--- a/RNTester/js/AssetScaledImageExample.js
+++ b/RNTester/js/AssetScaledImageExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AssetScaledImageExample
diff --git a/RNTester/js/AsyncStorageExample.js b/RNTester/js/AsyncStorageExample.js
index 872baf8d0795cb..5e16a6b847c42c 100644
--- a/RNTester/js/AsyncStorageExample.js
+++ b/RNTester/js/AsyncStorageExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AsyncStorageExample
diff --git a/RNTester/js/BorderExample.js b/RNTester/js/BorderExample.js
index 3bb5de8fce78ca..8885537fb35b43 100644
--- a/RNTester/js/BorderExample.js
+++ b/RNTester/js/BorderExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BorderExample
  */
diff --git a/RNTester/js/BoxShadowExample.js b/RNTester/js/BoxShadowExample.js
index eadb19acea85a2..bddce0490b3b2c 100644
--- a/RNTester/js/BoxShadowExample.js
+++ b/RNTester/js/BoxShadowExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BoxShadowExample
  */
diff --git a/RNTester/js/ButtonExample.js b/RNTester/js/ButtonExample.js
index 10a3567b609dce..6c850a2121a7f6 100644
--- a/RNTester/js/ButtonExample.js
+++ b/RNTester/js/ButtonExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ButtonExample
diff --git a/RNTester/js/CameraRollExample.js b/RNTester/js/CameraRollExample.js
index 74188072a71270..508980d47196ad 100644
--- a/RNTester/js/CameraRollExample.js
+++ b/RNTester/js/CameraRollExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule CameraRollExample
diff --git a/RNTester/js/CameraRollView.js b/RNTester/js/CameraRollView.js
index 40d5606885620c..f69a4feed65fcb 100644
--- a/RNTester/js/CameraRollView.js
+++ b/RNTester/js/CameraRollView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CameraRollView
  * @flow
@@ -74,7 +72,6 @@ var propTypes = {
 
 var CameraRollView = createReactClass({
   displayName: 'CameraRollView',
-  // $FlowFixMe(>=0.41.0)
   propTypes: propTypes,
 
   getDefaultProps: function(): Object {
diff --git a/RNTester/js/CheckBoxExample.js b/RNTester/js/CheckBoxExample.js
index 42e689180fc381..98685fac4be787 100644
--- a/RNTester/js/CheckBoxExample.js
+++ b/RNTester/js/CheckBoxExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule CheckBoxExample
diff --git a/RNTester/js/ClipboardExample.js b/RNTester/js/ClipboardExample.js
index f4e6d45afb2693..8526cea43340e4 100644
--- a/RNTester/js/ClipboardExample.js
+++ b/RNTester/js/ClipboardExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ClipboardExample
diff --git a/RNTester/js/DatePickerAndroidExample.js b/RNTester/js/DatePickerAndroidExample.js
index 8665d45a3bf155..926071b66d7a4a 100644
--- a/RNTester/js/DatePickerAndroidExample.js
+++ b/RNTester/js/DatePickerAndroidExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerAndroidExample
  */
diff --git a/RNTester/js/DatePickerIOSExample.js b/RNTester/js/DatePickerIOSExample.js
index d03c19faefc726..b11e0644c20d80 100644
--- a/RNTester/js/DatePickerIOSExample.js
+++ b/RNTester/js/DatePickerIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule DatePickerIOSExample
diff --git a/RNTester/js/DimensionsExample.js b/RNTester/js/DimensionsExample.js
index 9560a43d31d4e5..9611eedd482de1 100644
--- a/RNTester/js/DimensionsExample.js
+++ b/RNTester/js/DimensionsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DimensionsExample
  * @flow
diff --git a/RNTester/js/ExampleTypes.js b/RNTester/js/ExampleTypes.js
index 9b6ae77878a713..e747e43be9f940 100644
--- a/RNTester/js/ExampleTypes.js
+++ b/RNTester/js/ExampleTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ExampleTypes
  * @flow
diff --git a/RNTester/js/FlatListExample.js b/RNTester/js/FlatListExample.js
index aa2f805b73563b..9effcf9396c9ce 100644
--- a/RNTester/js/FlatListExample.js
+++ b/RNTester/js/FlatListExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule FlatListExample
diff --git a/RNTester/js/GeolocationExample.js b/RNTester/js/GeolocationExample.js
index 02088ea295776d..1282673f0acb91 100644
--- a/RNTester/js/GeolocationExample.js
+++ b/RNTester/js/GeolocationExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule GeolocationExample
diff --git a/RNTester/js/ImageCapInsetsExample.js b/RNTester/js/ImageCapInsetsExample.js
index 88830779e1d424..645d002b9be457 100644
--- a/RNTester/js/ImageCapInsetsExample.js
+++ b/RNTester/js/ImageCapInsetsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageCapInsetsExample
  * @flow
diff --git a/RNTester/js/ImageEditingExample.js b/RNTester/js/ImageEditingExample.js
index f59e5891ab2d10..d9defa775f5ae3 100644
--- a/RNTester/js/ImageEditingExample.js
+++ b/RNTester/js/ImageEditingExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ImageEditingExample
diff --git a/RNTester/js/ImageExample.js b/RNTester/js/ImageExample.js
index 1c56c3eab0b9f0..d30a24ca7c93b2 100644
--- a/RNTester/js/ImageExample.js
+++ b/RNTester/js/ImageExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ImageExample
diff --git a/RNTester/js/InputAccessoryViewExample.js b/RNTester/js/InputAccessoryViewExample.js
new file mode 100644
index 00000000000000..13b5885789b967
--- /dev/null
+++ b/RNTester/js/InputAccessoryViewExample.js
@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule InputAccessoryViewExample
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+const Alert = require('Alert');
+const Button = require('Button');
+const Dimensions = require('Dimensions');
+const InputAccessoryView = require('InputAccessoryView');
+const React = require('React');
+const ScrollView = require('ScrollView');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const TextInput = require('TextInput');
+const View = require('View');
+
+class Message extends React.PureComponent<*> {
+  render() {
+    return (
+      <View style={styles.textBubbleBackground}>
+        <Text style={styles.text}>Text Message</Text>
+      </View>
+    );
+  }
+}
+
+class TextInputBar extends React.PureComponent<*, *> {
+  state = {text: ''};
+
+  render() {
+    const {width} = Dimensions.get('window');
+    return (
+      <View style={[styles.textInputContainer, {width}]}>
+        <TextInput
+          style={styles.textInput}
+          onChangeText={text => {
+            this.setState({text});
+          }}
+          value={this.state.text}
+          placeholder={'Type a message...'}
+        />
+        <Button
+          onPress={() => {
+            Alert.alert('You tapped the button!');
+          }}
+          title="Send"
+        />
+      </View>
+    );
+  }
+}
+
+class InputAccessoryViewExample extends React.Component<*> {
+  static title = '<InputAccessoryView>';
+  static description = 'Example showing how to use an InputAccessoryView to build an iMessage-like sticky text input';
+
+  render() {
+    return (
+      <View>
+        <ScrollView keyboardDismissMode="interactive">
+          {Array(15)
+            .fill()
+            .map((_, i) => <Message key={i} />)}
+        </ScrollView>
+        <InputAccessoryView backgroundColor="#fffffff7">
+          <TextInputBar />
+        </InputAccessoryView>
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  textInputContainer: {
+    flexDirection: 'row',
+  },
+  textInput: {
+    flex: 1,
+    paddingLeft: 10,
+  },
+  text: {
+    padding: 10,
+    color: 'white',
+  },
+  textBubbleBackground: {
+    backgroundColor: '#2f7bf6',
+    borderRadius: 20,
+    width: 110,
+    margin: 20,
+  },
+});
+
+module.exports = InputAccessoryViewExample;
diff --git a/RNTester/js/KeyboardAvoidingViewExample.js b/RNTester/js/KeyboardAvoidingViewExample.js
index 1f26e18f9915cb..3b52f3accbb760 100644
--- a/RNTester/js/KeyboardAvoidingViewExample.js
+++ b/RNTester/js/KeyboardAvoidingViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule KeyboardAvoidingViewExample
  */
diff --git a/RNTester/js/LayoutAnimationExample.js b/RNTester/js/LayoutAnimationExample.js
index 58a2950eb3c095..92134409879afe 100644
--- a/RNTester/js/LayoutAnimationExample.js
+++ b/RNTester/js/LayoutAnimationExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule LayoutAnimationExample
diff --git a/RNTester/js/LayoutEventsExample.js b/RNTester/js/LayoutEventsExample.js
index c1e99d4964ebca..37b9811d8d4080 100644
--- a/RNTester/js/LayoutEventsExample.js
+++ b/RNTester/js/LayoutEventsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule LayoutEventsExample
diff --git a/RNTester/js/LayoutExample.js b/RNTester/js/LayoutExample.js
index 8292befad39179..eec0faa433d265 100644
--- a/RNTester/js/LayoutExample.js
+++ b/RNTester/js/LayoutExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule LayoutExample
diff --git a/RNTester/js/LinkingExample.js b/RNTester/js/LinkingExample.js
index 7da8f99fca9e7c..52297f07cf8ed6 100644
--- a/RNTester/js/LinkingExample.js
+++ b/RNTester/js/LinkingExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LinkingExample
  */
diff --git a/RNTester/js/ListExampleShared.js b/RNTester/js/ListExampleShared.js
index d9569efb0d1c97..c5eef14dbac902 100644
--- a/RNTester/js/ListExampleShared.js
+++ b/RNTester/js/ListExampleShared.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ListExampleShared
@@ -64,6 +62,9 @@ class ItemComponent extends React.PureComponent<{
         onPress={this._onPress}
         onShowUnderlay={this.props.onShowUnderlay}
         onHideUnderlay={this.props.onHideUnderlay}
+        tvParallaxProperties={{
+          pressMagnification: 1.1,
+        }}
         style={horizontal ? styles.horizItem : styles.item}>
         <View style={[
           styles.row, horizontal && {width: HORIZ_WIDTH}, fixedHeight && {height: ITEM_HEIGHT}]}>
@@ -201,7 +202,7 @@ function pressItem(context: Object, key: string) {
 }
 
 function renderSmallSwitchOption(context: Object, key: string) {
-  if(Platform.isTVOS) {
+  if (Platform.isTVOS) {
     return null;
   }
   return (
diff --git a/RNTester/js/ListViewExample.js b/RNTester/js/ListViewExample.js
index 7937739c7f2b63..ee828423618784 100644
--- a/RNTester/js/ListViewExample.js
+++ b/RNTester/js/ListViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ListViewExample
diff --git a/RNTester/js/ListViewGridLayoutExample.js b/RNTester/js/ListViewGridLayoutExample.js
index 8e31ebb3ea3d79..636db62fccecb7 100644
--- a/RNTester/js/ListViewGridLayoutExample.js
+++ b/RNTester/js/ListViewGridLayoutExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ListViewGridLayoutExample
diff --git a/RNTester/js/ListViewPagingExample.js b/RNTester/js/ListViewPagingExample.js
index b247f167884c51..3d68e7ec54683c 100644
--- a/RNTester/js/ListViewPagingExample.js
+++ b/RNTester/js/ListViewPagingExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ListViewPagingExample
  * @flow
diff --git a/RNTester/js/MaskedViewExample.js b/RNTester/js/MaskedViewExample.js
index 84a757eee6b998..cca734b53576a1 100644
--- a/RNTester/js/MaskedViewExample.js
+++ b/RNTester/js/MaskedViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule MaskedViewExample
diff --git a/RNTester/js/ModalExample.js b/RNTester/js/ModalExample.js
index e0c4a55b22c5cb..12093f4d8f4e07 100644
--- a/RNTester/js/ModalExample.js
+++ b/RNTester/js/ModalExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ModalExample
diff --git a/RNTester/js/MultiColumnExample.js b/RNTester/js/MultiColumnExample.js
index cad2560eefc61f..cc323cfcdad8c0 100644
--- a/RNTester/js/MultiColumnExample.js
+++ b/RNTester/js/MultiColumnExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule MultiColumnExample
diff --git a/RNTester/js/NativeAnimationsExample.js b/RNTester/js/NativeAnimationsExample.js
index ed6f1acaf7045a..983b0c9d290fe0 100644
--- a/RNTester/js/NativeAnimationsExample.js
+++ b/RNTester/js/NativeAnimationsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule NativeAnimationsExample
@@ -255,6 +253,67 @@ class EventExample extends React.Component<{}, $FlowFixMeState> {
   }
 }
 
+class TrackingExample extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
+  state = {
+    native: new Animated.Value(0),
+    toNative: new Animated.Value(0),
+    js: new Animated.Value(0),
+    toJS: new Animated.Value(0),
+  };
+
+  componentDidMount() {
+    // we configure spring to take a bit of time to settle so that the user
+    // have time to click many times and see "toValue" getting updated and
+    const longSettlingSpring = {
+      tension: 20,
+      friction: 0.5,
+    };
+    Animated.spring(this.state.native, {
+      ...longSettlingSpring,
+      toValue: this.state.toNative,
+      useNativeDriver: true,
+    }).start();
+    Animated.spring(this.state.js, {
+      ...longSettlingSpring,
+      toValue: this.state.toJS,
+      useNativeDriver: false,
+    }).start();
+  }
+
+  onPress = () => {
+    // select next value to be tracked by random
+    const nextValue = Math.random() * 200;
+    this.state.toNative.setValue(nextValue);
+    this.state.toJS.setValue(nextValue);
+  };
+
+  renderBlock = (anim, dest) => [
+    <Animated.View key="line" style={[styles.line, { transform: [{ translateX: dest }]}]}/>,
+    <Animated.View key="block" style={[styles.block, { transform: [{ translateX: anim }]}]}/>,
+  ]
+
+  render() {
+    return (
+      <TouchableWithoutFeedback onPress={this.onPress}>
+        <View>
+          <View>
+            <Text>Native:</Text>
+          </View>
+          <View style={styles.row}>
+            {this.renderBlock(this.state.native, this.state.toNative)}
+          </View>
+          <View>
+            <Text>JavaScript:</Text>
+          </View>
+          <View style={styles.row}>
+            {this.renderBlock(this.state.js, this.state.toJS)}
+          </View>
+        </View>
+      </TouchableWithoutFeedback>
+    );
+  }
+}
+
 const styles = StyleSheet.create({
   row: {
     padding: 10,
@@ -265,6 +324,14 @@ const styles = StyleSheet.create({
     height: 50,
     backgroundColor: 'blue',
   },
+  line: {
+    position: 'absolute',
+    left: 35,
+    top: 0,
+    bottom: 0,
+    width: 1,
+    backgroundColor: 'red',
+  },
 });
 
 exports.framework = 'React';
@@ -540,6 +607,12 @@ exports.examples = [
       return <EventExample />;
     },
   },
+  {
+    title: 'Animated Tracking - tap me many times',
+    render: function() {
+      return <TrackingExample />;
+    },
+  },
   {
     title: 'Internal Settings',
     render: function() {
diff --git a/RNTester/js/NavigatorIOSBarStyleExample.js b/RNTester/js/NavigatorIOSBarStyleExample.js
index 761d54304e4beb..d9d53edd3c99a2 100644
--- a/RNTester/js/NavigatorIOSBarStyleExample.js
+++ b/RNTester/js/NavigatorIOSBarStyleExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * The examples provided by Facebook are for non-commercial testing and
  * evaluation purposes only.
diff --git a/RNTester/js/NavigatorIOSColorsExample.js b/RNTester/js/NavigatorIOSColorsExample.js
index 62aed681200beb..f34c9c9d10aff3 100644
--- a/RNTester/js/NavigatorIOSColorsExample.js
+++ b/RNTester/js/NavigatorIOSColorsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NavigatorIOSColorsExample
  */
diff --git a/RNTester/js/NavigatorIOSExample.js b/RNTester/js/NavigatorIOSExample.js
index 458445e68dc347..79ee6f0fd07065 100644
--- a/RNTester/js/NavigatorIOSExample.js
+++ b/RNTester/js/NavigatorIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule NavigatorIOSExample
diff --git a/RNTester/js/NetInfoExample.js b/RNTester/js/NetInfoExample.js
index 6c909a57e75a11..0ba8dd2ff8c895 100644
--- a/RNTester/js/NetInfoExample.js
+++ b/RNTester/js/NetInfoExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule NetInfoExample
diff --git a/RNTester/js/OrientationChangeExample.js b/RNTester/js/OrientationChangeExample.js
index 6dde81f9ef9344..af6f9b1feeca09 100644
--- a/RNTester/js/OrientationChangeExample.js
+++ b/RNTester/js/OrientationChangeExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule OrientationChangeExample
  * @flow
diff --git a/RNTester/js/PanResponderExample.js b/RNTester/js/PanResponderExample.js
index 2acc3b594496c5..27d9a8016677b4 100644
--- a/RNTester/js/PanResponderExample.js
+++ b/RNTester/js/PanResponderExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow weak
  * @providesModule PanResponderExample
diff --git a/RNTester/js/PermissionsExampleAndroid.android.js b/RNTester/js/PermissionsExampleAndroid.android.js
index aff60b4d94d504..cb837183a6295d 100644
--- a/RNTester/js/PermissionsExampleAndroid.android.js
+++ b/RNTester/js/PermissionsExampleAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PermissionsExampleAndroid
  * @flow
diff --git a/RNTester/js/PickerExample.js b/RNTester/js/PickerExample.js
index 595ee87a37315e..1a1005cdaa2d03 100644
--- a/RNTester/js/PickerExample.js
+++ b/RNTester/js/PickerExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule PickerExample
diff --git a/RNTester/js/PickerIOSExample.js b/RNTester/js/PickerIOSExample.js
index 34f04ca59c32af..a4d5de63a046c7 100644
--- a/RNTester/js/PickerIOSExample.js
+++ b/RNTester/js/PickerIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule PickerIOSExample
diff --git a/RNTester/js/PointerEventsExample.js b/RNTester/js/PointerEventsExample.js
index e255d2f4754137..ac838c4eb8e370 100644
--- a/RNTester/js/PointerEventsExample.js
+++ b/RNTester/js/PointerEventsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule PointerEventsExample
diff --git a/RNTester/js/ProgressBarAndroidExample.android.js b/RNTester/js/ProgressBarAndroidExample.android.js
index 263e0e067e4acd..baa75b9ff1e6d2 100644
--- a/RNTester/js/ProgressBarAndroidExample.android.js
+++ b/RNTester/js/ProgressBarAndroidExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ProgressBarAndroidExample
diff --git a/RNTester/js/ProgressViewIOSExample.js b/RNTester/js/ProgressViewIOSExample.js
index 6b7be48a07a90b..d0641760965c6a 100644
--- a/RNTester/js/ProgressViewIOSExample.js
+++ b/RNTester/js/ProgressViewIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ProgressViewIOSExample
diff --git a/RNTester/js/PushNotificationIOSExample.js b/RNTester/js/PushNotificationIOSExample.js
index 10b8f7700485fd..c2368e9a782b14 100644
--- a/RNTester/js/PushNotificationIOSExample.js
+++ b/RNTester/js/PushNotificationIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule PushNotificationIOSExample
diff --git a/RNTester/js/RCTRootViewIOSExample.js b/RNTester/js/RCTRootViewIOSExample.js
index 17303d5fe9a074..f6b3b20536efa4 100644
--- a/RNTester/js/RCTRootViewIOSExample.js
+++ b/RNTester/js/RCTRootViewIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RCTRootViewIOSExample
diff --git a/RNTester/js/RNTesterActions.js b/RNTester/js/RNTesterActions.js
index ad203842b48825..2bf967b3c2e66b 100644
--- a/RNTester/js/RNTesterActions.js
+++ b/RNTester/js/RNTesterActions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterActions
diff --git a/RNTester/js/RNTesterApp.android.js b/RNTester/js/RNTesterApp.android.js
index b185191b4aafd4..d5f05d12a90a3c 100644
--- a/RNTester/js/RNTesterApp.android.js
+++ b/RNTester/js/RNTesterApp.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterApp
  * @flow
diff --git a/RNTester/js/RNTesterApp.ios.js b/RNTester/js/RNTesterApp.ios.js
index 49feb6243f6355..26ee1ebbdd976d 100644
--- a/RNTester/js/RNTesterApp.ios.js
+++ b/RNTester/js/RNTesterApp.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterApp
  * @flow
@@ -146,9 +144,9 @@ const styles = StyleSheet.create({
     borderBottomColor: '#96969A',
     backgroundColor: '#F5F5F6',
   },
-  header: { 
-    height: 40, 
-    flexDirection: 'row' 
+  header: {
+    height: 40,
+    flexDirection: 'row'
   },
   headerLeft: {
   },
diff --git a/RNTester/js/RNTesterBlock.js b/RNTester/js/RNTesterBlock.js
index bd854ed1793a6a..58ca4d0a5f0c03 100644
--- a/RNTester/js/RNTesterBlock.js
+++ b/RNTester/js/RNTesterBlock.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterBlock
  * @flow
diff --git a/RNTester/js/RNTesterButton.js b/RNTester/js/RNTesterButton.js
index 94329d21bfddb9..835eb9db113edd 100644
--- a/RNTester/js/RNTesterButton.js
+++ b/RNTester/js/RNTesterButton.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterButton
diff --git a/RNTester/js/RNTesterExampleContainer.js b/RNTester/js/RNTesterExampleContainer.js
index 635cd021471f40..e5d1ab816d1dcb 100644
--- a/RNTester/js/RNTesterExampleContainer.js
+++ b/RNTester/js/RNTesterExampleContainer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterExampleContainer
  */
diff --git a/RNTester/js/RNTesterExampleList.js b/RNTester/js/RNTesterExampleList.js
index 7df411bcd4b80a..96e1ed9b474a68 100644
--- a/RNTester/js/RNTesterExampleList.js
+++ b/RNTester/js/RNTesterExampleList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterExampleList
@@ -22,15 +20,9 @@ const RNTesterActions = require('./RNTesterActions');
 const RNTesterStatePersister = require('./RNTesterStatePersister');
 const View = require('View');
 
-import type {
-  RNTesterExample,
-} from './RNTesterList.ios';
-import type {
-  PassProps,
-} from './RNTesterStatePersister';
-import type {
-  StyleObj,
-} from 'StyleSheetTypes';
+import type {RNTesterExample} from './RNTesterList.ios';
+import type {PassProps} from './RNTesterStatePersister';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 
 type Props = {
   onNavigate: Function,
@@ -39,8 +31,8 @@ type Props = {
     APIExamples: Array<RNTesterExample>,
   },
   persister: PassProps<*>,
-  searchTextInputStyle: StyleObj,
-  style?: ?StyleObj,
+  searchTextInputStyle: DangerouslyImpreciseStyleProp,
+  style?: ?DangerouslyImpreciseStyleProp,
 };
 
 class RowComponent extends React.PureComponent<{
diff --git a/RNTester/js/RNTesterList.android.js b/RNTester/js/RNTesterList.android.js
index eee084dd023864..feea07f72cdb85 100644
--- a/RNTester/js/RNTesterList.android.js
+++ b/RNTester/js/RNTesterList.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterList
diff --git a/RNTester/js/RNTesterList.ios.js b/RNTester/js/RNTesterList.ios.js
index b01a54d792be68..fa95044d77dd49 100644
--- a/RNTester/js/RNTesterList.ios.js
+++ b/RNTester/js/RNTesterList.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterList
@@ -48,6 +46,11 @@ const ComponentExamples: Array<RNTesterExample> = [
     module: require('./ImageExample'),
     supportsTVOS: true,
   },
+  {
+    key: 'InputAccessoryViewExample',
+    module: require('./InputAccessoryViewExample'),
+    supportsTVOS: true,
+  },
   {
     key: 'KeyboardAvoidingViewExample',
     module: require('./KeyboardAvoidingViewExample'),
@@ -191,7 +194,7 @@ const ComponentExamples: Array<RNTesterExample> = [
   {
     key: 'TouchableExample',
     module: require('./TouchableExample'),
-    supportsTVOS: false,
+    supportsTVOS: true,
   },
   {
     key: 'TransparentHitTestExample',
diff --git a/RNTester/js/RNTesterNavigationReducer.js b/RNTester/js/RNTesterNavigationReducer.js
index 0bedcb24daac93..c8ffa5a5fe7c00 100644
--- a/RNTester/js/RNTesterNavigationReducer.js
+++ b/RNTester/js/RNTesterNavigationReducer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterNavigationReducer
diff --git a/RNTester/js/RNTesterPage.js b/RNTester/js/RNTesterPage.js
index ed5d58f0d0e68f..5dfb3bda2039ea 100644
--- a/RNTester/js/RNTesterPage.js
+++ b/RNTester/js/RNTesterPage.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterPage
  * @flow
diff --git a/RNTester/js/RNTesterSettingSwitchRow.js b/RNTester/js/RNTesterSettingSwitchRow.js
index c252476f8d3cf1..97d2f8d60be40a 100644
--- a/RNTester/js/RNTesterSettingSwitchRow.js
+++ b/RNTester/js/RNTesterSettingSwitchRow.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterSettingSwitchRow
  * @flow
diff --git a/RNTester/js/RNTesterStatePersister.js b/RNTester/js/RNTesterStatePersister.js
index 1e6f42cb6f4d80..310386c49bb7f4 100644
--- a/RNTester/js/RNTesterStatePersister.js
+++ b/RNTester/js/RNTesterStatePersister.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterStatePersister
diff --git a/RNTester/js/RNTesterTitle.js b/RNTester/js/RNTesterTitle.js
index 255ed72287ba0e..9afd68a66a7c05 100644
--- a/RNTester/js/RNTesterTitle.js
+++ b/RNTester/js/RNTesterTitle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterTitle
  * @flow
diff --git a/RNTester/js/RTLExample.js b/RNTester/js/RTLExample.js
index c7cf4930b454b5..aad38a9fedc9df 100644
--- a/RNTester/js/RTLExample.js
+++ b/RNTester/js/RTLExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/RNTester/js/RefreshControlExample.js b/RNTester/js/RefreshControlExample.js
index c2ef5b5fdb62fd..7962a457e29bc0 100644
--- a/RNTester/js/RefreshControlExample.js
+++ b/RNTester/js/RefreshControlExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RefreshControlExample
  */
diff --git a/RNTester/js/RootViewSizeFlexibilityExampleApp.js b/RNTester/js/RootViewSizeFlexibilityExampleApp.js
index 296a22dc1b3aae..066a6d425e926b 100644
--- a/RNTester/js/RootViewSizeFlexibilityExampleApp.js
+++ b/RNTester/js/RootViewSizeFlexibilityExampleApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RootViewSizeFlexibilityExampleApp
diff --git a/RNTester/js/SafeAreaViewExample.js b/RNTester/js/SafeAreaViewExample.js
index aafb8d74ef711d..c3d5a99f8208e6 100644
--- a/RNTester/js/SafeAreaViewExample.js
+++ b/RNTester/js/SafeAreaViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/RNTester/js/ScrollViewExample.js b/RNTester/js/ScrollViewExample.js
index 4af1ddada33cce..f5b5c8aab8fd5c 100644
--- a/RNTester/js/ScrollViewExample.js
+++ b/RNTester/js/ScrollViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ScrollViewExample
@@ -12,7 +10,7 @@
  */
 'use strict';
 
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 
 const ActivityIndicator = require('ActivityIndicator');
 const Platform = require('Platform');
@@ -254,7 +252,7 @@ if (Platform.OS === 'ios') {
 class Thumb extends React.PureComponent<{|
   source?: string | number,
   msg?: string,
-  style?: StyleObj,
+  style?: DangerouslyImpreciseStyleProp,
 |}> {
   render() {
     const {source} = this.props;
diff --git a/RNTester/js/ScrollViewSimpleExample.js b/RNTester/js/ScrollViewSimpleExample.js
index c3ac0786bd7f1d..0a6713122a885d 100644
--- a/RNTester/js/ScrollViewSimpleExample.js
+++ b/RNTester/js/ScrollViewSimpleExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ScrollViewSimpleExample
diff --git a/RNTester/js/SectionListExample.js b/RNTester/js/SectionListExample.js
index 51708951506a99..d5d7e685c6c6e1 100644
--- a/RNTester/js/SectionListExample.js
+++ b/RNTester/js/SectionListExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SectionListExample
diff --git a/RNTester/js/SegmentedControlIOSExample.js b/RNTester/js/SegmentedControlIOSExample.js
index e6c4c054f0b897..c5441e7cc4dc87 100644
--- a/RNTester/js/SegmentedControlIOSExample.js
+++ b/RNTester/js/SegmentedControlIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SegmentedControlIOSExample
diff --git a/RNTester/js/SetPropertiesExampleApp.js b/RNTester/js/SetPropertiesExampleApp.js
index a3b5f90142454e..8113f5279570db 100644
--- a/RNTester/js/SetPropertiesExampleApp.js
+++ b/RNTester/js/SetPropertiesExampleApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SetPropertiesExampleApp
diff --git a/RNTester/js/ShareExample.js b/RNTester/js/ShareExample.js
index 9b4d05342dab2c..00d3330d83c27c 100644
--- a/RNTester/js/ShareExample.js
+++ b/RNTester/js/ShareExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ShareExample
diff --git a/RNTester/js/SliderExample.js b/RNTester/js/SliderExample.js
index 906c9092258389..3b4980ac800488 100644
--- a/RNTester/js/SliderExample.js
+++ b/RNTester/js/SliderExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SliderExample
diff --git a/RNTester/js/SnapshotExample.js b/RNTester/js/SnapshotExample.js
index d0d9c172b7dd83..160434b53b260b 100644
--- a/RNTester/js/SnapshotExample.js
+++ b/RNTester/js/SnapshotExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SnapshotExample
diff --git a/RNTester/js/StatusBarExample.js b/RNTester/js/StatusBarExample.js
index bb84bd05b29bc4..0df43f42edb371 100644
--- a/RNTester/js/StatusBarExample.js
+++ b/RNTester/js/StatusBarExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule StatusBarExample
diff --git a/RNTester/js/SwipeableFlatListExample.js b/RNTester/js/SwipeableFlatListExample.js
index ac69abec01ce11..432e6d813d5053 100644
--- a/RNTester/js/SwipeableFlatListExample.js
+++ b/RNTester/js/SwipeableFlatListExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableFlatListExample
  * @flow
diff --git a/RNTester/js/SwipeableListViewExample.js b/RNTester/js/SwipeableListViewExample.js
index 42e9c9c8947033..c004f86e3e6aad 100644
--- a/RNTester/js/SwipeableListViewExample.js
+++ b/RNTester/js/SwipeableListViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SwipeableListViewExample
diff --git a/RNTester/js/SwitchExample.js b/RNTester/js/SwitchExample.js
index ee6902d43a0db6..ca721ce4488e6c 100644
--- a/RNTester/js/SwitchExample.js
+++ b/RNTester/js/SwitchExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SwitchExample
diff --git a/RNTester/js/TVEventHandlerExample.js b/RNTester/js/TVEventHandlerExample.js
index 4d0aa3ae826144..bc6346d0d2b04f 100644
--- a/RNTester/js/TVEventHandlerExample.js
+++ b/RNTester/js/TVEventHandlerExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TVEventHandlerExample
diff --git a/RNTester/js/TabBarIOSBarStyleExample.js b/RNTester/js/TabBarIOSBarStyleExample.js
index 1b4b193db2dd9d..5c42c5ccf1ef11 100644
--- a/RNTester/js/TabBarIOSBarStyleExample.js
+++ b/RNTester/js/TabBarIOSBarStyleExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * The examples provided by Facebook are for non-commercial testing and
  * evaluation purposes only.
diff --git a/RNTester/js/TabBarIOSExample.js b/RNTester/js/TabBarIOSExample.js
index 4fe3c80fd8b33c..82c47cccdfe2f3 100644
--- a/RNTester/js/TabBarIOSExample.js
+++ b/RNTester/js/TabBarIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TabBarIOSExample
diff --git a/RNTester/js/TextExample.android.js b/RNTester/js/TextExample.android.js
index 17133be48cf50c..0b0bf195f68fb7 100644
--- a/RNTester/js/TextExample.android.js
+++ b/RNTester/js/TextExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TextExample
@@ -343,6 +341,36 @@ class TextExample extends React.Component<{}> {
             Holisticly formulate inexpensive ideas before best-of-breed benefits. <Text style={{fontSize: 20}}>Continually</Text> expedite magnetic potentialities rather than client-focused interfaces.
           </Text>
         </RNTesterBlock>
+        <RNTesterBlock title="Letter Spacing">
+          <View>
+            <Text style={{letterSpacing: 0}}>
+              letterSpacing = 0
+            </Text>
+            <Text style={{letterSpacing: 2, marginTop: 5}}>
+              letterSpacing = 2
+            </Text>
+            <Text style={{letterSpacing: 9, marginTop: 5}}>
+              letterSpacing = 9
+            </Text>
+            <View style={{flexDirection: 'row'}}>
+              <Text style={{fontSize: 12, letterSpacing: 2, backgroundColor: 'fuchsia', marginTop: 5}}>
+                With size and background color
+              </Text>
+            </View>
+            <Text style={{letterSpacing: -1, marginTop: 5}}>
+              letterSpacing = -1
+            </Text>
+            <Text style={{letterSpacing: 3, backgroundColor: '#dddddd', marginTop: 5}}>
+              [letterSpacing = 3]
+              <Text style={{letterSpacing: 0, backgroundColor: '#bbbbbb'}}>
+                [Nested letterSpacing = 0]
+              </Text>
+              <Text style={{letterSpacing: 6, backgroundColor: '#eeeeee'}}>
+                [Nested letterSpacing = 6]
+              </Text>
+            </Text>
+          </View>
+        </RNTesterBlock>
         <RNTesterBlock title="Empty Text">
           <Text />
         </RNTesterBlock>
diff --git a/RNTester/js/TextExample.ios.js b/RNTester/js/TextExample.ios.js
index 5caf0089286623..e5510390d0a353 100644
--- a/RNTester/js/TextExample.ios.js
+++ b/RNTester/js/TextExample.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TextExample
@@ -15,7 +13,7 @@ const Platform = require('Platform');
 var React = require('react');
 var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
-var {Image, Text, View, LayoutAnimation, Button} = ReactNative;
+var {Image, Text, TextInput, View, LayoutAnimation, Button} = ReactNative;
 
 type TextAlignExampleRTLState = {|
   isRTL: boolean,
@@ -224,6 +222,70 @@ var AdjustingFontSize = createReactClass({
   },
 });
 
+class TextBaseLineLayoutExample extends React.Component<*, *> {
+  render() {
+    var texts = [];
+    for (var i = 9; i >= 0; i--) {
+      texts.push(<Text key={i} style={{fontSize: 8 + i * 5, backgroundColor: '#eee'}}>{i}</Text>);
+    }
+
+    const marker = <View style={{width: 20, height: 20, backgroundColor: 'gray'}} />;
+    const subtitleStyle = {fontSize: 16, marginTop: 8, fontWeight: 'bold'};
+
+    return (
+      <View>
+        <Text style={subtitleStyle}>{'Nested <Text/>s:'}</Text>
+        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
+          {marker}
+          <Text>
+            {texts}
+          </Text>
+          {marker}
+        </View>
+
+        <Text style={subtitleStyle}>{'Array of <Text/>s in <View>:'}</Text>
+        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
+          {marker}
+          {texts}
+          {marker}
+        </View>
+
+        <Text style={subtitleStyle}>{'Interleaving <View> and <Text>:'}</Text>
+        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
+          {marker}
+          <Text selectable={true}>
+            Some text.
+            <View style={{flexDirection: 'row', alignItems: 'baseline', backgroundColor: '#eee'}}>
+              {marker}
+              <Text>Text inside View.</Text>
+              {marker}
+            </View>
+          </Text>
+          {marker}
+        </View>
+
+        <Text style={subtitleStyle}>{'<TextInput/>:'}</Text>
+        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
+          {marker}
+          <TextInput style={{margin: 0, padding: 0}}>
+            {texts}
+          </TextInput>
+          {marker}
+        </View>
+
+        <Text style={subtitleStyle}>{'<TextInput multiline/>:'}</Text>
+        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
+          {marker}
+          <TextInput multiline={true} style={{margin: 0, padding: 0}}>
+            {texts}
+          </TextInput>
+          {marker}
+        </View>
+      </View>
+    );
+  }
+}
+
 exports.title = '<Text>';
 exports.description = 'Base component for rendering styled text.';
 exports.displayName = 'TextExample';
@@ -513,9 +575,23 @@ exports.examples = [
           <Text style={{letterSpacing: 9, marginTop: 5}}>
             letterSpacing = 9
           </Text>
+          <View style={{flexDirection: 'row'}}>
+            <Text style={{fontSize: 12, letterSpacing: 2, backgroundColor: 'fuchsia', marginTop: 5}}>
+              With size and background color
+            </Text>
+          </View>
           <Text style={{letterSpacing: -1, marginTop: 5}}>
             letterSpacing = -1
           </Text>
+          <Text style={{letterSpacing: 3, backgroundColor: '#dddddd', marginTop: 5}}>
+            [letterSpacing = 3]
+            <Text style={{letterSpacing: 0, backgroundColor: '#bbbbbb'}}>
+              [Nested letterSpacing = 0]
+            </Text>
+            <Text style={{letterSpacing: 6, backgroundColor: '#eeeeee'}}>
+              [Nested letterSpacing = 6]
+            </Text>
+          </Text>
         </View>
       );
     },
@@ -780,4 +856,10 @@ exports.examples = [
       return <TextAlignRTLExample />;
     },
   },
+  {
+    title: 'Text `alignItems: \'baseline\'` style',
+    render: function() {
+      return <TextBaseLineLayoutExample />;
+    },
+  },
 ];
diff --git a/RNTester/js/TextInputExample.android.js b/RNTester/js/TextInputExample.android.js
index fa0d5986bad5d8..358d3fd043b02d 100644
--- a/RNTester/js/TextInputExample.android.js
+++ b/RNTester/js/TextInputExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TextInputExample
@@ -569,6 +567,31 @@ exports.examples = [
       );
     }
   },
+  {
+    title: 'letterSpacing',
+    render: function() {
+      return (
+        <View>
+          <TextInput
+            style={[styles.singleLine, {letterSpacing: 0}]}
+            placeholder="letterSpacing = 0"
+          />
+          <TextInput
+            style={[styles.singleLine, {letterSpacing: 2}]}
+            placeholder="letterSpacing = 2"
+          />
+          <TextInput
+            style={[styles.singleLine, {letterSpacing: 9}]}
+            placeholder="letterSpacing = 9"
+          />
+          <TextInput
+            style={[styles.singleLine, {letterSpacing: -1}]}
+            placeholder="letterSpacing = -1"
+          />
+        </View>
+      );
+    }
+  },
   {
     title: 'Passwords',
     render: function() {
diff --git a/RNTester/js/TextInputExample.ios.js b/RNTester/js/TextInputExample.ios.js
index cca082b92dc0ff..9ace0a94ae6fab 100644
--- a/RNTester/js/TextInputExample.ios.js
+++ b/RNTester/js/TextInputExample.ios.js
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TextInputExample
  */
 'use strict';
 
+const Button = require('Button');
+const InputAccessoryView = require('InputAccessoryView');
 var React = require('react');
 var ReactNative = require('react-native');
 var {
@@ -93,6 +93,35 @@ class TextEventsExample extends React.Component<{}, $FlowFixMeState> {
   }
 }
 
+class TextInputAccessoryViewExample extends React.Component<{}, *> {
+  constructor(props) {
+    super(props);
+    this.state = {text: 'Placeholder Text'};
+  }
+
+  render() {
+    const inputAccessoryViewID = 'inputAccessoryView1';
+    return (
+      <View>
+        <TextInput
+          style={styles.default}
+          inputAccessoryViewID={inputAccessoryViewID}
+          onChangeText={text => this.setState({text})}
+          value={this.state.text}
+        />
+        <InputAccessoryView nativeID={inputAccessoryViewID}>
+          <View style={{backgroundColor: 'white'}}>
+            <Button
+              onPress={() => this.setState({text: 'Placeholder Text'})}
+              title="Reset Text"
+            />
+          </View>
+        </InputAccessoryView>
+      </View>
+    );
+  }
+}
+
 class RewriteExample extends React.Component<$FlowFixMeProps, any> {
   constructor(props) {
     super(props);
@@ -487,6 +516,12 @@ exports.examples = [
       return <RewriteExampleInvalidCharacters />;
     }
   },
+  {
+    title: 'Keyboard Accessory View',
+    render: function() {
+      return <TextInputAccessoryViewExample />;
+    }
+  },
   {
     title: 'Auto-capitalize',
     render: function() {
diff --git a/RNTester/js/TimePickerAndroidExample.js b/RNTester/js/TimePickerAndroidExample.js
index b16a8d16c7b3e1..7e1afa6367d7d1 100644
--- a/RNTester/js/TimePickerAndroidExample.js
+++ b/RNTester/js/TimePickerAndroidExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimePickerAndroidExample
  */
diff --git a/RNTester/js/TimerExample.js b/RNTester/js/TimerExample.js
index 7faf66756adf7d..d7e966010f9ada 100644
--- a/RNTester/js/TimerExample.js
+++ b/RNTester/js/TimerExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TimerExample
diff --git a/RNTester/js/ToastAndroidExample.android.js b/RNTester/js/ToastAndroidExample.android.js
index 90b5bc6d1b90c7..e86a21cb83ef3b 100644
--- a/RNTester/js/ToastAndroidExample.android.js
+++ b/RNTester/js/ToastAndroidExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ToastAndroidExample
diff --git a/RNTester/js/ToolbarAndroidExample.android.js b/RNTester/js/ToolbarAndroidExample.android.js
index b7e833ccc41ffb..e197518704740f 100644
--- a/RNTester/js/ToolbarAndroidExample.android.js
+++ b/RNTester/js/ToolbarAndroidExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ToolbarAndroidExample
diff --git a/RNTester/js/ToolbarAndroidExample.ios.js b/RNTester/js/ToolbarAndroidExample.ios.js
new file mode 100644
index 00000000000000..b2553dc1b2bc9f
--- /dev/null
+++ b/RNTester/js/ToolbarAndroidExample.ios.js
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @providesModule ToolbarAndroidExample
+ */
+'use strict';
+
+// Not applicable to iOS.
+module.exports = require('View');
diff --git a/RNTester/js/TouchableExample.js b/RNTester/js/TouchableExample.js
index 4977daafdfcda3..e0c227d9ca3f7f 100644
--- a/RNTester/js/TouchableExample.js
+++ b/RNTester/js/TouchableExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TouchableExample
@@ -57,6 +55,7 @@ exports.examples = [
             style={styles.wrapper}
             activeOpacity={1}
             animationVelocity={0}
+            tvParallaxProperties={{pressMagnification: 1.3, pressDuration: 0.6}}
             underlayColor="rgb(210, 230, 255)"
             onPress={() => console.log('custom THW text - highlight')}>
             <View style={styles.wrapperCustom}>
diff --git a/RNTester/js/TransformExample.js b/RNTester/js/TransformExample.js
index 731ced76edf61a..17e2a89fc98d26 100644
--- a/RNTester/js/TransformExample.js
+++ b/RNTester/js/TransformExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TransformExample
diff --git a/RNTester/js/TransparentHitTestExample.js b/RNTester/js/TransparentHitTestExample.js
index 1eb8633b85daca..89db856a473500 100644
--- a/RNTester/js/TransparentHitTestExample.js
+++ b/RNTester/js/TransparentHitTestExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TransparentHitTestExample
diff --git a/RNTester/js/URIActionMap.js b/RNTester/js/URIActionMap.js
index 76c108f59c9498..fb47214aadd5c0 100644
--- a/RNTester/js/URIActionMap.js
+++ b/RNTester/js/URIActionMap.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule URIActionMap
diff --git a/RNTester/js/VibrationExample.js b/RNTester/js/VibrationExample.js
index 4e68083d7c56b7..9e6d6d7d768b8a 100644
--- a/RNTester/js/VibrationExample.js
+++ b/RNTester/js/VibrationExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule VibrationExample
diff --git a/RNTester/js/VibrationIOSExample.js b/RNTester/js/VibrationIOSExample.js
index 24b4342ccb92fe..9093ff87af28ce 100644
--- a/RNTester/js/VibrationIOSExample.js
+++ b/RNTester/js/VibrationIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule VibrationIOSExample
diff --git a/RNTester/js/ViewExample.js b/RNTester/js/ViewExample.js
index 0516462cc9e443..b4c4a6c2a65818 100644
--- a/RNTester/js/ViewExample.js
+++ b/RNTester/js/ViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ViewExample
diff --git a/RNTester/js/ViewPagerAndroidExample.android.js b/RNTester/js/ViewPagerAndroidExample.android.js
index f59a59dc47793f..1f2ac75d8f22eb 100644
--- a/RNTester/js/ViewPagerAndroidExample.android.js
+++ b/RNTester/js/ViewPagerAndroidExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewPagerAndroidExample
  */
diff --git a/RNTester/js/WebSocketExample.js b/RNTester/js/WebSocketExample.js
index a859c5cc7f3c87..ad4a6f8be4719a 100644
--- a/RNTester/js/WebSocketExample.js
+++ b/RNTester/js/WebSocketExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebSocketExample
  * @format
diff --git a/RNTester/js/WebViewExample.js b/RNTester/js/WebViewExample.js
index d04600512d1705..d3bc575361e5fd 100644
--- a/RNTester/js/WebViewExample.js
+++ b/RNTester/js/WebViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule WebViewExample
diff --git a/RNTester/js/XHRExample.js b/RNTester/js/XHRExample.js
index cd14fe88a4774f..1ee8315d03ba67 100644
--- a/RNTester/js/XHRExample.js
+++ b/RNTester/js/XHRExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExample
diff --git a/RNTester/js/XHRExampleBinaryUpload.js b/RNTester/js/XHRExampleBinaryUpload.js
index adf854d235aeef..e5635724378683 100644
--- a/RNTester/js/XHRExampleBinaryUpload.js
+++ b/RNTester/js/XHRExampleBinaryUpload.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleBinaryUpload
diff --git a/RNTester/js/XHRExampleCookies.js b/RNTester/js/XHRExampleCookies.js
index e9328af09f75c4..08ff72b369cb22 100644
--- a/RNTester/js/XHRExampleCookies.js
+++ b/RNTester/js/XHRExampleCookies.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleCookies
diff --git a/RNTester/js/XHRExampleDownload.js b/RNTester/js/XHRExampleDownload.js
index e636ab298aaff0..a419f9ba539ed2 100644
--- a/RNTester/js/XHRExampleDownload.js
+++ b/RNTester/js/XHRExampleDownload.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleDownload
diff --git a/RNTester/js/XHRExampleFetch.js b/RNTester/js/XHRExampleFetch.js
index 7917bfe11b8350..2aea3be975f4fb 100644
--- a/RNTester/js/XHRExampleFetch.js
+++ b/RNTester/js/XHRExampleFetch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleFetch
diff --git a/RNTester/js/XHRExampleFormData.js b/RNTester/js/XHRExampleFormData.js
index 7d9409853207bb..228af6345bd4a0 100644
--- a/RNTester/js/XHRExampleFormData.js
+++ b/RNTester/js/XHRExampleFormData.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleFormData
diff --git a/RNTester/js/XHRExampleHeaders.js b/RNTester/js/XHRExampleHeaders.js
index b0aad13bdc64ac..8476b1600ef670 100644
--- a/RNTester/js/XHRExampleHeaders.js
+++ b/RNTester/js/XHRExampleHeaders.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @noflow
  * @providesModule XHRExampleHeaders
diff --git a/RNTester/js/XHRExampleOnTimeOut.js b/RNTester/js/XHRExampleOnTimeOut.js
index 7d30f0d7a2b041..d3c50025c2d0fe 100644
--- a/RNTester/js/XHRExampleOnTimeOut.js
+++ b/RNTester/js/XHRExampleOnTimeOut.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleOnTimeOut
diff --git a/RNTester/js/createExamplePage.js b/RNTester/js/createExamplePage.js
index 55c9a666661ddf..e381f05b8d2c54 100644
--- a/RNTester/js/createExamplePage.js
+++ b/RNTester/js/createExamplePage.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule createExamplePage
  * @flow
diff --git a/RNTester/js/http_test_server.js b/RNTester/js/http_test_server.js
index 7af1f052eb6c5d..cd9e18e5407d7f 100755
--- a/RNTester/js/http_test_server.js
+++ b/RNTester/js/http_test_server.js
@@ -1,11 +1,9 @@
 #!/usr/bin/env node
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule http_test_server
@@ -30,11 +28,7 @@ const app = connect();
 
 app.use(function(req, res) {
   console.log('received request');
-  const cookieOptions = {
-    //httpOnly: true, // the cookie is not accessible by the user (javascript,...)
-    secure: false, // allow HTTP
-  };
-  res.cookie('wstest', 'OK', cookieOptions);
+  res.setHeader('Set-Cookie', ['wstest=OK; Path=/']);
   res.end('Cookie has been set!\n');
 });
 
diff --git a/RNTester/js/websocket_test_server.js b/RNTester/js/websocket_test_server.js
index 01feb12d54d77c..83a48ed213f062 100755
--- a/RNTester/js/websocket_test_server.js
+++ b/RNTester/js/websocket_test_server.js
@@ -1,11 +1,9 @@
 #!/usr/bin/env node
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule websocket_test_server
diff --git a/React.podspec b/React.podspec
index eb9b0c979a9ddb..a9a4de5a523e3d 100644
--- a/React.podspec
+++ b/React.podspec
@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
   s.requires_arc            = true
   s.platforms               = { :ios => "8.0", :tvos => "9.2" }
   s.pod_target_xcconfig     = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" }
-  s.preserve_paths          = "package.json", "LICENSE", "LICENSE-docs", "PATENTS"
+  s.preserve_paths          = "package.json", "LICENSE", "LICENSE-docs"
   s.cocoapods_version       = ">= 1.2.0"
 
   s.subspec "Core" do |ss|
@@ -51,6 +51,7 @@ Pod::Spec.new do |s|
                               "React/Inspector/*",
                               "ReactCommon/yoga/*",
                               "React/Cxx*/*",
+                              "React/Fabric/*",
     ss.ios.exclude_files    = "React/**/RCTTV*.*"
     ss.tvos.exclude_files   = "React/Modules/RCTClipboard*",
                               "React/Views/RCTDatePicker*",
diff --git a/React/Base/RCTAssert.h b/React/Base/RCTAssert.h
index c3bb2cf7f694d6..5e60a7b206a4b9 100644
--- a/React/Base/RCTAssert.h
+++ b/React/Base/RCTAssert.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTAssert.m b/React/Base/RCTAssert.m
index 79db51973c46ec..61cefe2ad5fca2 100644
--- a/React/Base/RCTAssert.m
+++ b/React/Base/RCTAssert.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAssert.h"
diff --git a/React/Base/RCTBridge+Private.h b/React/Base/RCTBridge+Private.h
index fd49df387f8772..1995801ffcaaea 100644
--- a/React/Base/RCTBridge+Private.h
+++ b/React/Base/RCTBridge+Private.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <JavaScriptCore/JavaScriptCore.h>
diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index 4944ce711c246b..2a7eabe5ce84ba 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
@@ -21,10 +19,16 @@
 @class RCTPerformanceLogger;
 
 /**
- * This notification fires when the bridge starts loading the JS bundle.
+ * This notification fires when the bridge initializes.
  */
 RCT_EXTERN NSString *const RCTJavaScriptWillStartLoadingNotification;
 
+
+/**
+ * This notification fires when the bridge starts executing the JS bundle.
+ */
+RCT_EXTERN NSString *const RCTJavaScriptWillStartExecutingNotification;
+
 /**
  * This notification fires when the bridge has finished loading the JS bundle.
  */
@@ -122,22 +126,6 @@ RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
 - (void)enqueueJSCall:(NSString *)moduleDotMethod args:(NSArray *)args;
 - (void)enqueueJSCall:(NSString *)module method:(NSString *)method args:(NSArray *)args completion:(dispatch_block_t)completion;
 
-/**
- * This method is used to call functions in the JavaScript application context
- * synchronously.  This is intended for use by applications which do their own
- * thread management and are careful to manage multi-threaded access to the JSVM.
- * See also -[RCTBridgeDelgate shouldBridgeLoadJavaScriptSynchronously], which
- * may be needed to ensure that any requires JS code is loaded before this method
- * is called.  If the underlying executor is not JSC, this will return nil.  Safe
- * to call from any thread.
- *
- * @experimental
- */
-- (JSValue *)callFunctionOnModule:(NSString *)module
-                           method:(NSString *)method
-                        arguments:(NSArray *)arguments
-                            error:(NSError **)error;
-
 /**
  * This method registers the file path of an additional JS segment by its ID.
  *
@@ -168,6 +156,11 @@ RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
  */
 - (BOOL)moduleIsInitialized:(Class)moduleClass;
 
+/**
+ * Retrieve an extra module that gets bound to the JS context, if any.
+ */
+- (id)jsBoundExtraModuleForClass:(Class)moduleClass;
+
 /**
  * All registered bridge module classes.
  */
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index 0b02e2380365ee..76f2d17a203faf 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBridge.h"
@@ -25,6 +23,7 @@
 #import "RCTUtils.h"
 
 NSString *const RCTJavaScriptWillStartLoadingNotification = @"RCTJavaScriptWillStartLoadingNotification";
+NSString *const RCTJavaScriptWillStartExecutingNotification = @"RCTJavaScriptWillStartExecutingNotification";
 NSString *const RCTJavaScriptDidLoadNotification = @"RCTJavaScriptDidLoadNotification";
 NSString *const RCTJavaScriptDidFailToLoadNotification = @"RCTJavaScriptDidFailToLoadNotification";
 NSString *const RCTDidInitializeModuleNotification = @"RCTDidInitializeModuleNotification";
@@ -251,6 +250,11 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
   return [self.batchedBridge moduleIsInitialized:moduleClass];
 }
 
+- (id)jsBoundExtraModuleForClass:(Class)moduleClass
+{
+  return [self.batchedBridge jsBoundExtraModuleForClass:moduleClass];
+}
+
 - (void)reload
 {
   #if RCT_ENABLE_INSPECTOR
@@ -361,14 +365,6 @@ - (void)enqueueCallback:(NSNumber *)cbID args:(NSArray *)args
   [self.batchedBridge enqueueCallback:cbID args:args];
 }
 
-- (JSValue *)callFunctionOnModule:(NSString *)module
-                           method:(NSString *)method
-                        arguments:(NSArray *)arguments
-                            error:(NSError **)error
-{
-  return [self.batchedBridge callFunctionOnModule:module method:method arguments:arguments error:error];
-}
-
 - (void)registerSegmentWithId:(NSUInteger)segmentId path:(NSString *)path
 {
   [self.batchedBridge registerSegmentWithId:segmentId path:path];
diff --git a/React/Base/RCTBridgeDelegate.h b/React/Base/RCTBridgeDelegate.h
index a5035b036998ef..b457e87dbc143c 100644
--- a/React/Base/RCTBridgeDelegate.h
+++ b/React/Base/RCTBridgeDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTJavaScriptLoader.h>
diff --git a/React/Base/RCTBridgeMethod.h b/React/Base/RCTBridgeMethod.h
index 8ffea53965c9e2..04202c6a5f0663 100644
--- a/React/Base/RCTBridgeMethod.h
+++ b/React/Base/RCTBridgeMethod.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h
index 25bff04134e40b..07116bb80ef950 100644
--- a/React/Base/RCTBridgeModule.h
+++ b/React/Base/RCTBridgeModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
@@ -187,7 +185,7 @@ RCT_EXTERN void RCTRegisterModule(Class); \
  */
 #define RCT_REMAP_METHOD(js_name, method) \
   _RCT_EXTERN_REMAP_METHOD(js_name, method, NO) \
-  - (void)method;
+  - (void)method RCT_DYNAMIC;
 
 /**
  * Similar to RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD but lets you set
@@ -199,7 +197,7 @@ RCT_EXTERN void RCTRegisterModule(Class); \
  */
 #define RCT_REMAP_BLOCKING_SYNCHRONOUS_METHOD(js_name, returnType, method) \
   _RCT_EXTERN_REMAP_METHOD(js_name, method, YES) \
-  - (returnType)method;
+  - (returnType)method RCT_DYNAMIC;
 
 /**
  * Use this macro in a private Objective-C implementation file to automatically
diff --git a/React/Base/RCTBundleURLProvider.h b/React/Base/RCTBundleURLProvider.h
index 7a2562e415585e..23ed40cbfccba8 100644
--- a/React/Base/RCTBundleURLProvider.h
+++ b/React/Base/RCTBundleURLProvider.h
@@ -1,18 +1,24 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 extern NSString *const RCTBundleURLProviderUpdatedNotification;
 
 extern const NSUInteger kRCTBundleURLProviderDefaultPort;
 
+#if defined(__cplusplus)
+}
+#endif
+
 @interface RCTBundleURLProvider : NSObject
 
 /**
diff --git a/React/Base/RCTBundleURLProvider.m b/React/Base/RCTBundleURLProvider.m
index f6fb3ce8af29fe..53af54d93efff0 100644
--- a/React/Base/RCTBundleURLProvider.m
+++ b/React/Base/RCTBundleURLProvider.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBundleURLProvider.h"
diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
index b3ef27cdb4cedf..5780c5f5f676a8 100644
--- a/React/Base/RCTConvert.h
+++ b/React/Base/RCTConvert.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <QuartzCore/QuartzCore.h>
@@ -179,7 +177,7 @@ RCT_CUSTOM_CONVERTER(type, name, [json getter])
  * This macro is used for creating converter functions with arbitrary logic.
  */
 #define RCT_CUSTOM_CONVERTER(type, name, code) \
-+ (type)name:(id)json                          \
++ (type)name:(id)json RCT_DYNAMIC              \
 {                                              \
   if (!RCT_DEBUG) {                            \
     return code;                               \
@@ -218,7 +216,7 @@ RCT_CUSTOM_CONVERTER(type, type, [RCT_DEBUG ? [self NSNumber:json] : json getter
  * This macro is used for creating converters for enum types.
  */
 #define RCT_ENUM_CONVERTER(type, values, default, getter) \
-+ (type)type:(id)json                                     \
++ (type)type:(id)json RCT_DYNAMIC                         \
 {                                                         \
   static NSDictionary *mapping;                           \
   static dispatch_once_t onceToken;                       \
@@ -233,7 +231,7 @@ RCT_CUSTOM_CONVERTER(type, type, [RCT_DEBUG ? [self NSNumber:json] : json getter
  * multiple enum values combined with | operator
  */
 #define RCT_MULTI_ENUM_CONVERTER(type, values, default, getter) \
-+ (type)type:(id)json                                     \
++ (type)type:(id)json RCT_DYNAMIC                         \
 {                                                         \
   static NSDictionary *mapping;                           \
   static dispatch_once_t onceToken;                       \
@@ -248,7 +246,7 @@ RCT_CUSTOM_CONVERTER(type, type, [RCT_DEBUG ? [self NSNumber:json] : json getter
  * for typed arrays.
  */
 #define RCT_ARRAY_CONVERTER_NAMED(type, name)          \
-+ (NSArray<type *> *)name##Array:(id)json              \
++ (NSArray<type *> *)name##Array:(id)json RCT_DYNAMIC  \
 {                                                      \
   return RCTConvertArrayValue(@selector(name:), json); \
 }
diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
index f2410f60f7f21d..173c9047530491 100644
--- a/React/Base/RCTConvert.m
+++ b/React/Base/RCTConvert.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert.h"
diff --git a/React/Base/RCTCxxConvert.h b/React/Base/RCTCxxConvert.h
index c7c063ffca3877..8519e774a79c3b 100644
--- a/React/Base/RCTCxxConvert.h
+++ b/React/Base/RCTCxxConvert.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTCxxConvert.m b/React/Base/RCTCxxConvert.m
index 5b65cdca72776c..458a1b90846863 100644
--- a/React/Base/RCTCxxConvert.m
+++ b/React/Base/RCTCxxConvert.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTCxxConvert.h"
diff --git a/React/Base/RCTDefines.h b/React/Base/RCTDefines.h
index 0124bf340561db..881af139d85c92 100644
--- a/React/Base/RCTDefines.h
+++ b/React/Base/RCTDefines.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #if __OBJC__
@@ -106,6 +104,17 @@
 #define RCT_CONCAT2(A, B) A ## B
 #define RCT_CONCAT(A, B) RCT_CONCAT2(A, B)
 
+/**
+  * This attribute is used for static analysis.
+  */
+#if !defined RCT_DYNAMIC
+#if __has_attribute(objc_dynamic)
+#define RCT_DYNAMIC __attribute__((objc_dynamic))
+#else
+#define RCT_DYNAMIC
+#endif
+#endif
+
 /**
  * Throw an assertion for unimplemented methods.
  */
diff --git a/React/Base/RCTDisplayLink.h b/React/Base/RCTDisplayLink.h
index d4de929c050c39..e6d850ef83dc4c 100644
--- a/React/Base/RCTDisplayLink.h
+++ b/React/Base/RCTDisplayLink.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTDisplayLink.m b/React/Base/RCTDisplayLink.m
index a53d35701fc5ba..9a4df006f05b46 100644
--- a/React/Base/RCTDisplayLink.m
+++ b/React/Base/RCTDisplayLink.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDisplayLink.h"
diff --git a/React/Base/RCTErrorCustomizer.h b/React/Base/RCTErrorCustomizer.h
index 23c8b24d36ebf9..b7d9e391bd8a9e 100644
--- a/React/Base/RCTErrorCustomizer.h
+++ b/React/Base/RCTErrorCustomizer.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTErrorInfo.h b/React/Base/RCTErrorInfo.h
index aaa42221410411..aff6b208d23e49 100644
--- a/React/Base/RCTErrorInfo.h
+++ b/React/Base/RCTErrorInfo.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTErrorInfo.m b/React/Base/RCTErrorInfo.m
index 37e055fd56496c..f3a25560cdad77 100644
--- a/React/Base/RCTErrorInfo.m
+++ b/React/Base/RCTErrorInfo.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTErrorInfo.h"
diff --git a/React/Base/RCTEventDispatcher.h b/React/Base/RCTEventDispatcher.h
index c5e36e64506499..f91e66e218b47f 100644
--- a/React/Base/RCTEventDispatcher.h
+++ b/React/Base/RCTEventDispatcher.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTEventDispatcher.m b/React/Base/RCTEventDispatcher.m
index 239da26654306f..00ec08f2f95df7 100644
--- a/React/Base/RCTEventDispatcher.m
+++ b/React/Base/RCTEventDispatcher.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTEventDispatcher.h"
diff --git a/React/Base/RCTFrameUpdate.h b/React/Base/RCTFrameUpdate.h
index bbf4bb6c9be9ac..197aef68983757 100644
--- a/React/Base/RCTFrameUpdate.h
+++ b/React/Base/RCTFrameUpdate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTFrameUpdate.m b/React/Base/RCTFrameUpdate.m
index dbbcc4a32b23ec..a5dea324c559d9 100644
--- a/React/Base/RCTFrameUpdate.m
+++ b/React/Base/RCTFrameUpdate.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <QuartzCore/CADisplayLink.h>
diff --git a/React/Base/RCTImageSource.h b/React/Base/RCTImageSource.h
index ade263ae68a31d..81f184e3e0b2df 100644
--- a/React/Base/RCTImageSource.h
+++ b/React/Base/RCTImageSource.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTImageSource.m b/React/Base/RCTImageSource.m
index b474d9b1125341..feb2f5abd24fe4 100644
--- a/React/Base/RCTImageSource.m
+++ b/React/Base/RCTImageSource.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageSource.h"
diff --git a/React/Base/RCTInvalidating.h b/React/Base/RCTInvalidating.h
index 1c8cf7920ed87a..89b7162d7d58aa 100644
--- a/React/Base/RCTInvalidating.h
+++ b/React/Base/RCTInvalidating.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTJSCErrorHandling.h b/React/Base/RCTJSCErrorHandling.h
index 4e948fe200214e..cd3c11400c2f0a 100644
--- a/React/Base/RCTJSCErrorHandling.h
+++ b/React/Base/RCTJSCErrorHandling.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <JavaScriptCore/JavaScriptCore.h>
diff --git a/React/Base/RCTJSCErrorHandling.mm b/React/Base/RCTJSCErrorHandling.mm
index 3030c19b613e2d..ed0490d94766e3 100644
--- a/React/Base/RCTJSCErrorHandling.mm
+++ b/React/Base/RCTJSCErrorHandling.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTJSCErrorHandling.h"
diff --git a/React/Base/RCTJSStackFrame.h b/React/Base/RCTJSStackFrame.h
index 34c0fbe93b248e..3a4504c7ed75a0 100644
--- a/React/Base/RCTJSStackFrame.h
+++ b/React/Base/RCTJSStackFrame.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTJSStackFrame.m b/React/Base/RCTJSStackFrame.m
index 08aabec6e99216..60976f673ba542 100644
--- a/React/Base/RCTJSStackFrame.m
+++ b/React/Base/RCTJSStackFrame.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTJSStackFrame.h"
diff --git a/React/Base/RCTJavaScriptExecutor.h b/React/Base/RCTJavaScriptExecutor.h
index 24df68852fc433..b7c8f7421d9ac9 100644
--- a/React/Base/RCTJavaScriptExecutor.h
+++ b/React/Base/RCTJavaScriptExecutor.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <objc/runtime.h>
diff --git a/React/Base/RCTJavaScriptLoader.h b/React/Base/RCTJavaScriptLoader.h
index 641b1ce6f9b3de..17e88212021dca 100755
--- a/React/Base/RCTJavaScriptLoader.h
+++ b/React/Base/RCTJavaScriptLoader.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTJavaScriptLoader.mm b/React/Base/RCTJavaScriptLoader.mm
index 09fd6c089b8d5e..983555dbd1a4b2 100755
--- a/React/Base/RCTJavaScriptLoader.mm
+++ b/React/Base/RCTJavaScriptLoader.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTJavaScriptLoader.h"
diff --git a/React/Base/RCTKeyCommands.h b/React/Base/RCTKeyCommands.h
index d93485749e2ea8..111031ba64c018 100644
--- a/React/Base/RCTKeyCommands.h
+++ b/React/Base/RCTKeyCommands.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTKeyCommands.m b/React/Base/RCTKeyCommands.m
index 29ceb84f91d9e4..581e937433e793 100644
--- a/React/Base/RCTKeyCommands.m
+++ b/React/Base/RCTKeyCommands.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTKeyCommands.h"
diff --git a/React/Base/RCTLog.h b/React/Base/RCTLog.h
index 0c6e2a048482bb..9f9317da410c66 100644
--- a/React/Base/RCTLog.h
+++ b/React/Base/RCTLog.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTLog.mm b/React/Base/RCTLog.mm
index fd6c6b80d3f869..edb92fe0146879 100644
--- a/React/Base/RCTLog.mm
+++ b/React/Base/RCTLog.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLog.h"
diff --git a/React/Base/RCTManagedPointer.h b/React/Base/RCTManagedPointer.h
index e084911230a4a8..5e7ef3a199f0bb 100644
--- a/React/Base/RCTManagedPointer.h
+++ b/React/Base/RCTManagedPointer.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #ifdef __cplusplus
diff --git a/React/Base/RCTManagedPointer.mm b/React/Base/RCTManagedPointer.mm
index a00a6a9820fb46..5cdb120f429f2d 100644
--- a/React/Base/RCTManagedPointer.mm
+++ b/React/Base/RCTManagedPointer.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTManagedPointer.h"
diff --git a/React/Base/RCTModuleData.h b/React/Base/RCTModuleData.h
index ad8523a74f8a11..14fa0a8ded7690 100644
--- a/React/Base/RCTModuleData.h
+++ b/React/Base/RCTModuleData.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTModuleData.mm b/React/Base/RCTModuleData.mm
index 54821f8a9a7dae..b248d51b728bb1 100644
--- a/React/Base/RCTModuleData.mm
+++ b/React/Base/RCTModuleData.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModuleData.h"
diff --git a/React/Base/RCTModuleMethod.h b/React/Base/RCTModuleMethod.h
index b9ef3f9ffa7485..1882e2259151ac 100644
--- a/React/Base/RCTModuleMethod.h
+++ b/React/Base/RCTModuleMethod.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTModuleMethod.mm b/React/Base/RCTModuleMethod.mm
index 9e1f534dc5f6b9..a8361482c4edcd 100644
--- a/React/Base/RCTModuleMethod.mm
+++ b/React/Base/RCTModuleMethod.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModuleMethod.h"
diff --git a/React/Base/RCTMultipartDataTask.h b/React/Base/RCTMultipartDataTask.h
index 25f559e3d524be..92967e2ae3ad65 100644
--- a/React/Base/RCTMultipartDataTask.h
+++ b/React/Base/RCTMultipartDataTask.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTMultipartDataTask.m b/React/Base/RCTMultipartDataTask.m
index 6ca63f3c4d8f16..c87a590fee70a4 100644
--- a/React/Base/RCTMultipartDataTask.m
+++ b/React/Base/RCTMultipartDataTask.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMultipartDataTask.h"
diff --git a/React/Base/RCTMultipartStreamReader.h b/React/Base/RCTMultipartStreamReader.h
index 30ffe5726d9ea8..7f7c6f95b27cd5 100644
--- a/React/Base/RCTMultipartStreamReader.h
+++ b/React/Base/RCTMultipartStreamReader.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTMultipartStreamReader.m b/React/Base/RCTMultipartStreamReader.m
index ad8c24c6dd1e75..53a16305a8d5a5 100644
--- a/React/Base/RCTMultipartStreamReader.m
+++ b/React/Base/RCTMultipartStreamReader.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMultipartStreamReader.h"
diff --git a/React/Base/RCTNullability.h b/React/Base/RCTNullability.h
index 6d250ee4702e9b..9994a075617653 100644
--- a/React/Base/RCTNullability.h
+++ b/React/Base/RCTNullability.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTParserUtils.h b/React/Base/RCTParserUtils.h
index 1dff0d5a858801..56945b34851004 100644
--- a/React/Base/RCTParserUtils.h
+++ b/React/Base/RCTParserUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTParserUtils.m b/React/Base/RCTParserUtils.m
index d70c4181b8e2a8..aa13b6344ac4cb 100644
--- a/React/Base/RCTParserUtils.m
+++ b/React/Base/RCTParserUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTParserUtils.h"
diff --git a/React/Base/RCTPerformanceLogger.h b/React/Base/RCTPerformanceLogger.h
index 7f82fc6956f741..92ede0c0c9d2b1 100644
--- a/React/Base/RCTPerformanceLogger.h
+++ b/React/Base/RCTPerformanceLogger.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTPerformanceLogger.m b/React/Base/RCTPerformanceLogger.m
index da1a2537df2c52..2427d7a8a64505 100644
--- a/React/Base/RCTPerformanceLogger.m
+++ b/React/Base/RCTPerformanceLogger.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <QuartzCore/QuartzCore.h>
diff --git a/React/Base/RCTPlatform.h b/React/Base/RCTPlatform.h
index 57b523414a2f00..5eae2a8c50c65d 100644
--- a/React/Base/RCTPlatform.h
+++ b/React/Base/RCTPlatform.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTPlatform.m b/React/Base/RCTPlatform.m
index 82a63167c23e82..4c1124b54cce58 100644
--- a/React/Base/RCTPlatform.m
+++ b/React/Base/RCTPlatform.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPlatform.h"
@@ -47,7 +45,7 @@ + (BOOL)requiresMainQueueSetup
     @"systemName": [device systemName],
     @"interfaceIdiom": interfaceIdiom([device userInterfaceIdiom]),
     @"isTesting": @(RCTRunningInTestEnvironment()),
-    @"reactNativeVersion": RCT_REACT_NATIVE_VERSION,
+    @"reactNativeVersion": RCTGetReactNativeVersion(),
   };
 }
 
diff --git a/React/Base/RCTReloadCommand.h b/React/Base/RCTReloadCommand.h
index 352ffd17304599..d70492fe52e8b6 100644
--- a/React/Base/RCTReloadCommand.h
+++ b/React/Base/RCTReloadCommand.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTReloadCommand.m b/React/Base/RCTReloadCommand.m
index 8428511a9c4308..98c0f2f8da7244 100644
--- a/React/Base/RCTReloadCommand.m
+++ b/React/Base/RCTReloadCommand.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTReloadCommand.h"
diff --git a/React/Base/RCTRootContentView.h b/React/Base/RCTRootContentView.h
index f667085e7ae43e..28a0646cfed752 100644
--- a/React/Base/RCTRootContentView.h
+++ b/React/Base/RCTRootContentView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTRootContentView.m b/React/Base/RCTRootContentView.m
index 2bd63c9ebc40c8..67b1f8b7002151 100644
--- a/React/Base/RCTRootContentView.m
+++ b/React/Base/RCTRootContentView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRootContentView.h"
@@ -100,6 +98,7 @@ - (void)invalidate
   if (self.userInteractionEnabled) {
     self.userInteractionEnabled = NO;
     [(RCTRootView *)self.superview contentViewInvalidated];
+
     [_bridge enqueueJSCall:@"AppRegistry"
                     method:@"unmountApplicationComponentAtRootTag"
                       args:@[self.reactTag]
diff --git a/React/Base/RCTRootView.h b/React/Base/RCTRootView.h
index bb4c9b7f59f319..daab13efbe8c21 100644
--- a/React/Base/RCTRootView.h
+++ b/React/Base/RCTRootView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
@@ -60,6 +58,7 @@ extern NSString *const RCTContentDidAppearNotification;
                 initialProperties:(NSDictionary *)initialProperties
                     launchOptions:(NSDictionary *)launchOptions;
 
+
 /**
  * The name of the JavaScript module to execute within the
  * specified scriptURL (required). Setting this will not have
diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m
index 6504097d426454..204dd5871be16b 100644
--- a/React/Base/RCTRootView.m
+++ b/React/Base/RCTRootView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRootView.h"
diff --git a/React/Base/RCTRootViewDelegate.h b/React/Base/RCTRootViewDelegate.h
index d5f6e4885e5d38..55630a2fa317c4 100644
--- a/React/Base/RCTRootViewDelegate.h
+++ b/React/Base/RCTRootViewDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTRootViewInternal.h b/React/Base/RCTRootViewInternal.h
index 1b3ff7bb7e81c9..93f7a88ef6bc51 100644
--- a/React/Base/RCTRootViewInternal.h
+++ b/React/Base/RCTRootViewInternal.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTRootView.h>
diff --git a/React/Base/RCTTVRemoteHandler.h b/React/Base/RCTTVRemoteHandler.h
index aedd9aefe0a93c..b220414a4bd5a4 100644
--- a/React/Base/RCTTVRemoteHandler.h
+++ b/React/Base/RCTTVRemoteHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTTVRemoteHandler.m b/React/Base/RCTTVRemoteHandler.m
index 8b39e8eddd2529..68d365c9166f93 100644
--- a/React/Base/RCTTVRemoteHandler.m
+++ b/React/Base/RCTTVRemoteHandler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTVRemoteHandler.h"
diff --git a/React/Base/RCTTouchEvent.h b/React/Base/RCTTouchEvent.h
index 329f84df0a9364..2d259b15f28fff 100644
--- a/React/Base/RCTTouchEvent.h
+++ b/React/Base/RCTTouchEvent.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTTouchEvent.m b/React/Base/RCTTouchEvent.m
index 02e0b528378a0a..0f1fdc30552f32 100644
--- a/React/Base/RCTTouchEvent.m
+++ b/React/Base/RCTTouchEvent.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTouchEvent.h"
diff --git a/React/Base/RCTTouchHandler.h b/React/Base/RCTTouchHandler.h
index 6f2df0444c3705..a4c2cf3af5d20b 100644
--- a/React/Base/RCTTouchHandler.h
+++ b/React/Base/RCTTouchHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTTouchHandler.m b/React/Base/RCTTouchHandler.m
index df4d2131178ada..00c5af9859162a 100644
--- a/React/Base/RCTTouchHandler.m
+++ b/React/Base/RCTTouchHandler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTouchHandler.h"
diff --git a/React/Base/RCTURLRequestDelegate.h b/React/Base/RCTURLRequestDelegate.h
index f038d1d6a998a5..6bc7afcd3824ff 100644
--- a/React/Base/RCTURLRequestDelegate.h
+++ b/React/Base/RCTURLRequestDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTURLRequestHandler.h b/React/Base/RCTURLRequestHandler.h
index 3cceb898394e86..acf0c2c489fc3d 100644
--- a/React/Base/RCTURLRequestHandler.h
+++ b/React/Base/RCTURLRequestHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/React/Base/RCTUtils.h b/React/Base/RCTUtils.h
index 6a3e0c08dfe9d4..910953f5b18acf 100644
--- a/React/Base/RCTUtils.h
+++ b/React/Base/RCTUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <tgmath.h>
diff --git a/React/Base/RCTUtils.m b/React/Base/RCTUtils.m
index e1610a6f40ee9c..22c426addcab0b 100644
--- a/React/Base/RCTUtils.m
+++ b/React/Base/RCTUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUtils.h"
diff --git a/React/Base/RCTVersion.h b/React/Base/RCTVersion.h
index c741022e5b8537..ca46f31421eac3 100644
--- a/React/Base/RCTVersion.h
+++ b/React/Base/RCTVersion.h
@@ -1,17 +1,16 @@
 /**
- * @generated by scripts/bump-oss-version.js
- *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
-#define RCT_REACT_NATIVE_VERSION @{ \
-  @"major": @(0), \
-  @"minor": @(0), \
-  @"patch": @(0), \
-  @"prerelease": [NSNull null], \
-}
+
+#import <Foundation/Foundation.h>
+
+extern NSString* const RCTVersionMajor;
+extern NSString* const RCTVersionMinor;
+extern NSString* const RCTVersionPatch;
+extern NSString* const RCTVersionPrerelease;
+
+extern NSDictionary* RCTGetReactNativeVersion(void);
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
new file mode 100644
index 00000000000000..aeb997451f2e42
--- /dev/null
+++ b/React/Base/RCTVersion.m
@@ -0,0 +1,33 @@
+/**
+ * @generated by scripts/bump-oss-version.js
+ *
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTVersion.h"
+
+NSString* const RCTVersionMajor = @"major";
+NSString* const RCTVersionMinor = @"minor";
+NSString* const RCTVersionPatch = @"patch";
+NSString* const RCTVersionPrerelease = @"prerelease";
+
+static NSDictionary* __rnVersion;
+
+__attribute__((constructor))
+static void __makeVersion()
+{
+  __rnVersion = @{
+                  RCTVersionMajor: @(0),
+                  RCTVersionMinor: @(55),
+                  RCTVersionPatch: @(4),
+                  RCTVersionPrerelease: [NSNull null],
+                  };
+}
+
+NSDictionary* RCTGetReactNativeVersion(void)
+{
+  return __rnVersion;
+}
diff --git a/React/Base/Surface/RCTSurface.h b/React/Base/Surface/RCTSurface.h
index 44a53f6569cba5..5c3566725e49b5 100644
--- a/React/Base/Surface/RCTSurface.h
+++ b/React/Base/Surface/RCTSurface.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
@@ -117,6 +115,19 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)synchronouslyWaitForStage:(RCTSurfaceStage)stage timeout:(NSTimeInterval)timeout;
 
+#pragma mark - Mounting/Unmounting of React components
+
+/**
+ * Mount the React component specified by the given moduleName. This is typically
+ * calling runApplication.js from the native side.
+ */
+- (void)mountReactComponentWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName params:(NSDictionary *)params;
+
+/**
+ * Unmount the React component specified by the given rootViewTag, called from native.
+ */
+- (void)unmountReactComponentWithBridge:(RCTBridge *)bridge rootViewTag:(NSNumber *)rootViewTag;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index 2c5b55cd176429..30110ceae42e71 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -1,16 +1,15 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurface.h"
 #import "RCTSurfaceView+Internal.h"
 
 #import <mutex>
+#import <stdatomic.h>
 
 #import "RCTAssert.h"
 #import "RCTBridge+Private.h"
@@ -23,9 +22,10 @@
 #import "RCTSurfaceView.h"
 #import "RCTTouchHandler.h"
 #import "RCTUIManager.h"
+#import "RCTUIManagerObserverCoordinator.h"
 #import "RCTUIManagerUtils.h"
 
-@interface RCTSurface () <RCTSurfaceRootShadowViewDelegate>
+@interface RCTSurface () <RCTSurfaceRootShadowViewDelegate, RCTUIManagerObserver>
 @end
 
 @implementation RCTSurface {
@@ -42,6 +42,7 @@ @implementation RCTSurface {
   CGSize _minimumSize;
   CGSize _maximumSize;
   CGSize _intrinsicSize;
+  RCTUIManagerMountingBlock _mountingBlock;
 
   // The Main thread only
   RCTSurfaceView *_Nullable _view;
@@ -50,8 +51,13 @@ @implementation RCTSurface {
   // Semaphores
   dispatch_semaphore_t _rootShadowViewDidStartRenderingSemaphore;
   dispatch_semaphore_t _rootShadowViewDidStartLayingOutSemaphore;
+  dispatch_semaphore_t _uiManagerDidPerformMountingSemaphore;
+
+  // Atomics
+  atomic_bool _waitingForMountingStageOnMainQueue;
 }
 
+
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
@@ -64,8 +70,10 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _moduleName = moduleName;
     _properties = [initialProperties copy];
     _rootViewTag = RCTAllocateRootViewTag();
+
     _rootShadowViewDidStartRenderingSemaphore = dispatch_semaphore_create(0);
     _rootShadowViewDidStartLayingOutSemaphore = dispatch_semaphore_create(0);
+    _uiManagerDidPerformMountingSemaphore = dispatch_semaphore_create(0);
 
     _minimumSize = CGSizeZero;
     _maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
@@ -86,6 +94,8 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
       _stage = _stage | RCTSurfaceStageBridgeDidLoad;
     }
 
+    [_bridge.uiManager.observerCoordinator addObserver:self];
+
     [self _registerRootView];
     [self _run];
   }
@@ -176,6 +186,10 @@ - (void)handleBridgeWillLoadJavaScriptNotification:(NSNotification *)notificatio
 {
   RCTAssertMainQueue();
 
+  // Reset states because the bridge is reloading. This is similar to initialization phase.
+  _stage = RCTSurfaceStageSurfaceDidInitialize;
+  _view = nil;
+  _touchHandler = nil;
   [self _setStage:RCTSurfaceStageBridgeDidLoad];
 }
 
@@ -199,6 +213,7 @@ - (void)handleBridgeDidLoadJavaScriptNotification:(NSNotification *)notification
   }
 
   if (isRerunNeeded) {
+    [self _registerRootView];
     [self _run];
   }
 }
@@ -291,21 +306,14 @@ - (void)_run
 
   RCTLogInfo(@"Running surface %@ (%@)", _moduleName, applicationParameters);
 
-  [batchedBridge enqueueJSCall:@"AppRegistry"
-                        method:@"runApplication"
-                          args:@[_moduleName, applicationParameters]
-                    completion:NULL];
+  [self mountReactComponentWithBridge:batchedBridge moduleName:_moduleName params:applicationParameters];
 
   [self _setStage:RCTSurfaceStageSurfaceDidRun];
 }
 
 - (void)_stop
 {
-  RCTBridge *batchedBridge = self._batchedBridge;
-  [batchedBridge enqueueJSCall:@"AppRegistry"
-                        method:@"unmountApplicationComponentAtRootTag"
-                          args:@[self->_rootViewTag]
-                    completion:NULL];
+  [self unmountReactComponentWithBridge:self._batchedBridge rootViewTag:self->_rootViewTag];
 }
 
 - (void)_registerRootView
@@ -323,7 +331,9 @@ - (void)_registerRootView
 
   RCTUIManager *uiManager = batchedBridge.uiManager;
 
-  RCTExecuteOnUIManagerQueue(^{
+  // If we are on the main queue now, we have to proceed synchronously.
+  // Otherwise, we cannot perform synchronous waiting for some stages later.
+  (RCTIsMainQueue() ? RCTUnsafeExecuteOnUIManagerQueueSync : RCTExecuteOnUIManagerQueue)(^{
     [uiManager registerRootViewTag:self->_rootViewTag];
 
     RCTSurfaceRootShadowView *rootShadowView =
@@ -435,16 +445,20 @@ - (CGSize)intrinsicSize
 
 - (BOOL)synchronouslyWaitForStage:(RCTSurfaceStage)stage timeout:(NSTimeInterval)timeout
 {
-  if (RCTIsMainQueue() && (stage == RCTSurfaceStageSurfaceDidInitialRendering)) {
-    // This case *temporary* does not supported.
-    stage = RCTSurfaceStageSurfaceDidInitialLayout;
-  }
-
   if (RCTIsUIManagerQueue()) {
     RCTLogInfo(@"Synchronous waiting is not supported on UIManager queue.");
     return NO;
   }
 
+  if (RCTIsMainQueue() && (stage == RCTSurfaceStageSurfaceDidInitialMounting)) {
+    // All main-threaded execution (especially mounting process) has to be
+    // intercepted, captured and performed synchnously at the end of this method
+    // right after the semaphore signals.
+
+    // Atomic variant of `_waitingForMountingStageOnMainQueue = YES;`
+    atomic_fetch_or(&_waitingForMountingStageOnMainQueue, 1);
+  }
+
   dispatch_semaphore_t semaphore;
   switch (stage) {
     case RCTSurfaceStageSurfaceDidInitialLayout:
@@ -453,17 +467,39 @@ - (BOOL)synchronouslyWaitForStage:(RCTSurfaceStage)stage timeout:(NSTimeInterval
     case RCTSurfaceStageSurfaceDidInitialRendering:
       semaphore = _rootShadowViewDidStartRenderingSemaphore;
       break;
+    case RCTSurfaceStageSurfaceDidInitialMounting:
+      semaphore = _uiManagerDidPerformMountingSemaphore;
+      break;
     default:
-      RCTAssert(NO, @"Only waiting for `RCTSurfaceStageSurfaceDidInitialRendering` and `RCTSurfaceStageSurfaceDidInitialLayout` stages is supported.");
+      RCTAssert(NO, @"Only waiting for `RCTSurfaceStageSurfaceDidInitialRendering`, `RCTSurfaceStageSurfaceDidInitialLayout` and `RCTSurfaceStageSurfaceDidInitialMounting` stages are supported.");
   }
 
   BOOL timeoutOccurred = dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, timeout * NSEC_PER_SEC));
+
+  // Atomic equivalent of `_waitingForMountingStageOnMainQueue = NO;`.
+  atomic_fetch_and(&_waitingForMountingStageOnMainQueue, 0);
+
   if (!timeoutOccurred) {
     // Balancing the semaphore.
     // Note: `dispatch_semaphore_wait` reverts the decrement in case when timeout occurred.
     dispatch_semaphore_signal(semaphore);
   }
 
+  if (RCTIsMainQueue() && (stage == RCTSurfaceStageSurfaceDidInitialMounting)) {
+    // Time to apply captured mounting block.
+    RCTUIManagerMountingBlock mountingBlock;
+    {
+      std::lock_guard<std::mutex> lock(_mutex);
+      mountingBlock = _mountingBlock;
+      _mountingBlock = nil;
+    }
+
+    if (mountingBlock) {
+      mountingBlock();
+      [self _mountRootViewIfNeeded];
+    }
+  }
+
   return !timeoutOccurred;
 }
 
@@ -493,4 +529,47 @@ - (void)rootShadowViewDidStartLayingOut:(RCTSurfaceRootShadowView *)rootShadowVi
   });
 }
 
+#pragma mark - RCTUIManagerObserver
+
+- (BOOL)uiManager:(RCTUIManager *)manager performMountingWithBlock:(RCTUIManagerMountingBlock)block
+{
+  if (atomic_load(&_waitingForMountingStageOnMainQueue) && (self.stage & RCTSurfaceStageSurfaceDidInitialLayout)) {
+    // Atomic equivalent of `_waitingForMountingStageOnMainQueue = NO;`.
+    atomic_fetch_and(&_waitingForMountingStageOnMainQueue, 0);
+
+    {
+      std::lock_guard<std::mutex> lock(_mutex);
+      _mountingBlock = block;
+    }
+    return YES;
+  }
+
+  return NO;
+}
+
+- (void)uiManagerDidPerformMounting:(RCTUIManager *)manager
+{
+  if (self.stage & RCTSurfaceStageSurfaceDidInitialLayout) {
+    [self _setStage:RCTSurfaceStageSurfaceDidInitialMounting];
+    dispatch_semaphore_signal(_uiManagerDidPerformMountingSemaphore);
+
+    // No need to listen to UIManager anymore.
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
+      [self->_bridge.uiManager.observerCoordinator removeObserver:self];
+    });
+  }
+}
+
+#pragma mark - Mounting/Unmounting of React components
+
+- (void)mountReactComponentWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName params:(NSDictionary *)params
+{
+  [bridge enqueueJSCall:@"AppRegistry" method:@"runApplication" args:@[moduleName, params] completion:NULL];
+}
+
+- (void)unmountReactComponentWithBridge:(RCTBridge *)bridge rootViewTag:(NSNumber *)rootViewTag
+{
+  [bridge enqueueJSCall:@"AppRegistry" method:@"unmountApplicationComponentAtRootTag" args:@[rootViewTag] completion:NULL];
+}
+
 @end
diff --git a/React/Base/Surface/RCTSurfaceDelegate.h b/React/Base/Surface/RCTSurfaceDelegate.h
index 5455320feb57af..adfea477bf6cf7 100644
--- a/React/Base/Surface/RCTSurfaceDelegate.h
+++ b/React/Base/Surface/RCTSurfaceDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.h b/React/Base/Surface/RCTSurfaceRootShadowView.h
index 86b12c393f0c46..09a9015996f2c4 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.h
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
@@ -29,10 +27,6 @@
  */
 @property (nonatomic, assign) YGDirection baseDirection;
 
-/**
- * Calculate all views whose frame needs updating after layout has been calculated.
- * Returns a set contains the shadowviews that need updating.
- */
-- (NSSet<RCTShadowView *> *)collectViewsWithUpdatedFrames;
+- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews;
 
 @end
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.m b/React/Base/Surface/RCTSurfaceRootShadowView.m
index 37a4c206ef57b3..a0765583b3fa79 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.m
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceRootShadowView.h"
@@ -43,37 +41,26 @@ - (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex
   }
 }
 
-- (void)calculateLayoutWithMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
+- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews
 {
-  YGNodeRef yogaNode = self.yogaNode;
+  NSHashTable<NSString *> *other = [NSHashTable new];
 
-  YGNodeStyleSetMinWidth(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.width));
-  YGNodeStyleSetMinHeight(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.height));
+  RCTLayoutContext layoutContext = {};
+  layoutContext.absolutePosition = CGPointZero;
+  layoutContext.affectedShadowViews = affectedShadowViews;
+  layoutContext.other = other;
 
-  YGNodeCalculateLayout(
-    self.yogaNode,
-    RCTYogaFloatFromCoreGraphicsFloat(maximumSize.width),
-    RCTYogaFloatFromCoreGraphicsFloat(maximumSize.height),
-    _baseDirection
-  );
-}
-
-- (NSSet<RCTShadowView *> *)collectViewsWithUpdatedFrames
-{
-  [self calculateLayoutWithMinimumSize:_minimumSize
-                           maximumSize:_maximumSize];
+  [self layoutWithMinimumSize:_minimumSize
+                  maximumSize:_maximumSize
+              layoutDirection:RCTUIKitLayoutDirectionFromYogaLayoutDirection(_baseDirection)
+                layoutContext:layoutContext];
 
-  NSMutableSet<RCTShadowView *> *viewsWithNewFrame = [NSMutableSet set];
-  [self applyLayoutNode:self.yogaNode viewsWithNewFrame:viewsWithNewFrame absolutePosition:CGPointZero];
-
-  self.intrinsicSize = self.frame.size;
+  self.intrinsicSize = self.layoutMetrics.frame.size;
 
   if (_isRendered && !_isLaidOut) {
     [_delegate rootShadowViewDidStartLayingOut:self];
     _isLaidOut = YES;
   }
-
-  return viewsWithNewFrame;
 }
 
 - (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
diff --git a/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h b/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h
index 1cfa6aecbcd587..bfc38f4ba9435a 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h
+++ b/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceRootView.h b/React/Base/Surface/RCTSurfaceRootView.h
index 927563a51f9718..0d8a8fd1e7df50 100644
--- a/React/Base/Surface/RCTSurfaceRootView.h
+++ b/React/Base/Surface/RCTSurfaceRootView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceRootView.mm b/React/Base/Surface/RCTSurfaceRootView.mm
index 5888b18867a6c8..25f67d5f267d4f 100644
--- a/React/Base/Surface/RCTSurfaceRootView.mm
+++ b/React/Base/Surface/RCTSurfaceRootView.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceRootView.h"
diff --git a/React/Base/Surface/RCTSurfaceStage.h b/React/Base/Surface/RCTSurfaceStage.h
index 8021ba7fc73329..08fd6663d2cc0d 100644
--- a/React/Base/Surface/RCTSurfaceStage.h
+++ b/React/Base/Surface/RCTSurfaceStage.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceStage.m b/React/Base/Surface/RCTSurfaceStage.m
index 322185be42e0c1..bf1234fa9017ab 100644
--- a/React/Base/Surface/RCTSurfaceStage.m
+++ b/React/Base/Surface/RCTSurfaceStage.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceStage.h"
diff --git a/React/Base/Surface/RCTSurfaceView+Internal.h b/React/Base/Surface/RCTSurfaceView+Internal.h
index b41bd3a34a2fe5..512bf3fb88c4f6 100644
--- a/React/Base/Surface/RCTSurfaceView+Internal.h
+++ b/React/Base/Surface/RCTSurfaceView+Internal.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceView.h b/React/Base/Surface/RCTSurfaceView.h
index 030cdcf4371316..eff7051045df6d 100644
--- a/React/Base/Surface/RCTSurfaceView.h
+++ b/React/Base/Surface/RCTSurfaceView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceView.mm b/React/Base/Surface/RCTSurfaceView.mm
index b062c1aff6b870..0c78f54eaa4b74 100644
--- a/React/Base/Surface/RCTSurfaceView.mm
+++ b/React/Base/Surface/RCTSurfaceView.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceView.h"
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
new file mode 100644
index 00000000000000..6e07b1ac0a8f7b
--- /dev/null
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTRootView.h>
+
+#import "RCTSurfaceHostingView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * This is a RCTRootView-compatible implementation of RCTSurfaceHostingView.
+ * Use this class to replace all usages of RCTRootView in the app for easier migration
+ * to RCTSurfaceHostingView.
+ *
+ * WARNING: In the future, RCTRootView will be deprecated in favor of RCTSurfaceHostingView.
+ */
+@interface RCTSurfaceHostingProxyRootView : RCTSurfaceHostingView
+
+#pragma mark RCTRootView compatibility - keep these sync'ed with RCTRootView.h
+
+@property (nonatomic, copy, readonly) NSString *moduleName;
+@property (nonatomic, strong, readonly) RCTBridge *bridge;
+@property (nonatomic, copy, readwrite) NSDictionary *appProperties;
+@property (nonatomic, assign) RCTRootViewSizeFlexibility sizeFlexibility;
+@property (nonatomic, weak) id<RCTRootViewDelegate> delegate;
+@property (nonatomic, weak) UIViewController *reactViewController;
+@property (nonatomic, strong, readonly) UIView *contentView;
+@property (nonatomic, strong) UIView *loadingView;
+@property (nonatomic, assign) BOOL passThroughTouches;
+@property (nonatomic, assign) NSTimeInterval loadingViewFadeDelay;
+@property (nonatomic, assign) NSTimeInterval loadingViewFadeDuration;
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL
+                       moduleName:(NSString *)moduleName
+                initialProperties:(NSDictionary *)initialProperties
+                    launchOptions:(NSDictionary *)launchOptions;
+
+- (void)cancelTouches;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
new file mode 100644
index 00000000000000..4fc100f6b6c15c
--- /dev/null
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
@@ -0,0 +1,183 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTSurfaceHostingProxyRootView.h"
+
+#import <objc/runtime.h>
+
+#import "RCTAssert.h"
+#import "RCTBridge.h"
+#import "RCTLog.h"
+#import "RCTPerformanceLogger.h"
+#import "RCTProfile.h"
+#import "RCTRootContentView.h"
+#import "RCTRootViewDelegate.h"
+#import "RCTSurface.h"
+#import "UIView+React.h"
+
+static RCTSurfaceSizeMeasureMode convertToSurfaceSizeMeasureMode(RCTRootViewSizeFlexibility sizeFlexibility) {
+  switch (sizeFlexibility) {
+    case RCTRootViewSizeFlexibilityWidthAndHeight:
+      return RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightUndefined;
+    case RCTRootViewSizeFlexibilityWidth:
+      return RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightExact;
+    case RCTRootViewSizeFlexibilityHeight:
+      return RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightUndefined;
+    case RCTRootViewSizeFlexibilityNone:
+      return RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact;
+  }
+}
+
+static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSizeMeasureMode sizeMeasureMode) {
+  switch (sizeMeasureMode) {
+    case RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightUndefined:
+      return RCTRootViewSizeFlexibilityWidthAndHeight;
+    case RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightExact:
+      return RCTRootViewSizeFlexibilityWidth;
+    case RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightUndefined:
+      return RCTRootViewSizeFlexibilityHeight;
+    case RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact:
+    default:
+      return RCTRootViewSizeFlexibilityNone;
+  }
+}
+
+@implementation RCTSurfaceHostingProxyRootView
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+{
+  RCTAssertMainQueue();
+  RCTAssert(bridge, @"A bridge instance is required to create an RCTSurfaceHostingProxyRootView");
+  RCTAssert(moduleName, @"A moduleName is required to create an RCTSurfaceHostingProxyRootView");
+
+  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTSurfaceHostingProxyRootView init]", nil);
+  if (!bridge.isLoading) {
+    [bridge.performanceLogger markStartForTag:RCTPLTTI];
+  }
+
+  if (self = [super initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties]) {
+    self.backgroundColor = [UIColor whiteColor];
+  }
+
+  RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
+
+  return self;
+}
+
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL
+                       moduleName:(NSString *)moduleName
+                initialProperties:(NSDictionary *)initialProperties
+                    launchOptions:(NSDictionary *)launchOptions
+{
+  RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:bundleURL
+                                            moduleProvider:nil
+                                             launchOptions:launchOptions];
+
+  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+}
+
+RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
+RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
+
+# pragma mark proxy methods to RCTSurfaceHostingView
+
+- (NSString *)moduleName
+{
+  return super.surface.moduleName;
+}
+
+- (RCTBridge *)bridge
+{
+  return super.surface.bridge;
+}
+
+- (UIView *)contentView
+{
+  return self;
+}
+
+- (NSNumber *)reactTag
+{
+  return super.surface.rootViewTag;
+}
+
+- (RCTRootViewSizeFlexibility)sizeFlexibility
+{
+  return convertToRootViewSizeFlexibility(super.sizeMeasureMode);
+}
+
+- (void)setSizeFlexibility:(RCTRootViewSizeFlexibility)sizeFlexibility
+{
+  super.sizeMeasureMode = convertToSurfaceSizeMeasureMode(sizeFlexibility);
+}
+
+- (NSDictionary *)appProperties
+{
+  return super.surface.properties;
+}
+
+- (void)setAppProperties:(NSDictionary *)appProperties
+{
+  [super.surface setProperties:appProperties];
+}
+
+- (CGSize)intrinsicContentSize
+{
+  return super.surface.intrinsicSize;
+}
+
+- (UIView *)loadingView
+{
+  return super.activityIndicatorViewFactory ? super.activityIndicatorViewFactory() : nil;
+}
+
+- (void)setLoadingView:(UIView *)loadingView
+{
+  super.activityIndicatorViewFactory = ^UIView *(void) {
+    return loadingView;
+  };
+}
+
+#pragma mark RCTSurfaceDelegate proxying
+
+- (void)surface:(RCTSurface *)surface didChangeStage:(RCTSurfaceStage)stage
+{
+  [super surface:surface didChangeStage:stage];
+  if (RCTSurfaceStageIsRunning(stage)) {
+    [super.surface.bridge.performanceLogger markStopForTag:RCTPLTTI];
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [[NSNotificationCenter defaultCenter] postNotificationName:RCTContentDidAppearNotification
+                                                          object:self];
+    });
+  }
+}
+
+- (void)surface:(RCTSurface *)surface didChangeIntrinsicSize:(CGSize)intrinsicSize
+{
+  [super surface:surface didChangeIntrinsicSize:intrinsicSize];
+
+  [_delegate rootViewDidChangeIntrinsicSize:(RCTRootView *)self];
+}
+
+#pragma mark legacy
+
+- (UIViewController *)reactViewController
+{
+  return _reactViewController ?: [super reactViewController];
+}
+
+#pragma mark unsupported
+
+- (void)cancelTouches
+{
+  // Not supported.
+}
+
+@end
+
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
index 48c91eba554220..4434df84e00503 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
@@ -1,14 +1,13 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
 
+#import <React/RCTSurfaceDelegate.h>
 #import <React/RCTSurfaceSizeMeasureMode.h>
 #import <React/RCTSurfaceStage.h>
 
@@ -25,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
  * This class can be used as easy-to-use general purpose integration point
  * of ReactNative-powered experiences in UIKit based apps.
  */
-@interface RCTSurfaceHostingView : UIView
+@interface RCTSurfaceHostingView : UIView <RCTSurfaceDelegate>
 
 /**
  * Designated initializer.
@@ -43,6 +42,13 @@ NS_ASSUME_NONNULL_BEGIN
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties;
 
+/**
+ * Create an instance of RCTSurface to be hosted.
+ */
+- (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge
+                             moduleName:(NSString *)moduleName
+                      initialProperties:(NSDictionary *)initialProperties;
+
 /**
  * Surface object which is currently using to power the view.
  * Read-only.
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
index 68fbb40e258f00..25b0f73337d353 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceHostingView.h"
@@ -15,7 +13,7 @@
 #import "RCTSurfaceView.h"
 #import "RCTUtils.h"
 
-@interface RCTSurfaceHostingView () <RCTSurfaceDelegate>
+@interface RCTSurfaceHostingView ()
 
 @property (nonatomic, assign) BOOL isActivityIndicatorViewVisible;
 @property (nonatomic, assign) BOOL isSurfaceViewVisible;
@@ -36,12 +34,9 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
 {
-  RCTSurface *surface =
-    [[RCTSurface alloc] initWithBridge:bridge
-                            moduleName:moduleName
-                     initialProperties:initialProperties];
-
+  RCTSurface *surface = [self createSurfaceWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
   return [self initWithSurface:surface];
+
 }
 
 - (instancetype)initWithSurface:(RCTSurface *)surface
@@ -61,6 +56,13 @@ - (instancetype)initWithSurface:(RCTSurface *)surface
   return self;
 }
 
+- (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge
+                             moduleName:(NSString *)moduleName
+                      initialProperties:(NSDictionary *)initialProperties
+{
+  return [[RCTSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+}
+
 - (void)setFrame:(CGRect)frame
 {
   [super setFrame:frame];
@@ -71,8 +73,8 @@ - (void)setFrame:(CGRect)frame
   RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
     self.bounds.size,
     _sizeMeasureMode,
-    minimumSize,
-    maximumSize
+    &minimumSize,
+    &maximumSize
   );
 
   [_surface setMinimumSize:minimumSize
@@ -108,8 +110,8 @@ - (CGSize)sizeThatFits:(CGSize)size
   RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
     size,
     _sizeMeasureMode,
-    minimumSize,
-    maximumSize
+    &minimumSize,
+    &maximumSize
   );
 
   return [_surface sizeThatFitsMinimumSize:minimumSize
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
index 37831e4e273761..ead7429b557419 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
@@ -30,6 +28,6 @@ typedef NS_OPTIONS(NSInteger, RCTSurfaceSizeMeasureMode) {
 RCT_EXTERN void RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
   CGSize size,
   RCTSurfaceSizeMeasureMode sizeMeasureMode,
-  CGSize &minimumSize,
-  CGSize &maximumSize
+  CGSize *minimumSize,
+  CGSize *maximumSize
 );
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
index 22cada768fcd03..946b027d8c0ac1 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
@@ -14,25 +12,25 @@
 void RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
   CGSize size,
   RCTSurfaceSizeMeasureMode sizeMeasureMode,
-  CGSize &minimumSize,
-  CGSize &maximumSize
+  CGSize *minimumSize,
+  CGSize *maximumSize
 ) {
-  minimumSize = CGSizeZero;
-  maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
+  *minimumSize = CGSizeZero;
+  *maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
 
   if (sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthExact) {
-    minimumSize.width = size.width;
-    maximumSize.width = size.width;
+    minimumSize->width = size.width;
+    maximumSize->width = size.width;
   }
   else if (sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthAtMost) {
-    maximumSize.width = size.width;
+    maximumSize->width = size.width;
   }
 
   if (sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightExact) {
-    minimumSize.height = size.height;
-    maximumSize.height = size.height;
+    minimumSize->height = size.height;
+    maximumSize->height = size.height;
   }
   else if (sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightAtMost) {
-    maximumSize.height = size.height;
+    maximumSize->height = size.height;
   }
 }
diff --git a/React/CxxBridge/NSDataBigString.h b/React/CxxBridge/NSDataBigString.h
index 8e24bdf821ae5b..c11d26efa92bf7 100644
--- a/React/CxxBridge/NSDataBigString.h
+++ b/React/CxxBridge/NSDataBigString.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/CxxBridge/NSDataBigString.mm b/React/CxxBridge/NSDataBigString.mm
index a295b51c255069..bea45458cdeeb1 100644
--- a/React/CxxBridge/NSDataBigString.mm
+++ b/React/CxxBridge/NSDataBigString.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "NSDataBigString.h"
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 1fbb2fd43032d7..7411dcdcc61394 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <atomic>
@@ -454,6 +452,18 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
   return _moduleDataByName[RCTBridgeModuleNameForClass(moduleClass)].hasInstance;
 }
 
+- (id)jsBoundExtraModuleForClass:(Class)moduleClass
+{
+  if ([self.delegate conformsToProtocol:@protocol(RCTCxxBridgeDelegate)]) {
+    id<RCTCxxBridgeDelegate> cxxDelegate = (id<RCTCxxBridgeDelegate>) self.delegate;
+    if ([cxxDelegate respondsToSelector:@selector(jsBoundExtraModuleForClass:)]) {
+      return [cxxDelegate jsBoundExtraModuleForClass:moduleClass];
+    }
+  }
+
+  return nil;
+}
+
 - (std::shared_ptr<ModuleRegistry>)_buildModuleRegistry
 {
   if (!self.valid) {
@@ -515,6 +525,8 @@ - (void)_initializeBridge:(std::shared_ptr<JSExecutorFactory>)executorFactory
         std::make_unique<JSBigStdString>("true"));
     }
 #endif
+
+    [self installExtraJSBinding];
   }
 
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
@@ -609,6 +621,16 @@ - (void)registerExtraModules
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 }
 
+- (void)installExtraJSBinding
+{
+  if ([self.delegate conformsToProtocol:@protocol(RCTCxxBridgeDelegate)]) {
+    id<RCTCxxBridgeDelegate> cxxDelegate = (id<RCTCxxBridgeDelegate>) self.delegate;
+    if ([cxxDelegate respondsToSelector:@selector(installExtraJSBinding:)]) {
+      [cxxDelegate installExtraJSBinding:self.jsContextRef];
+    }
+  }
+}
+
 - (void)_initModules:(NSArray<id<RCTBridgeModule>> *)modules
    withDispatchGroup:(dispatch_group_t)dispatchGroup
     lazilyDiscovered:(BOOL)lazilyDiscovered
@@ -1140,6 +1162,9 @@ - (void)executeApplicationScript:(NSData *)script
 {
   [self _tryAndHandleError:^{
     NSString *sourceUrlStr = deriveSourceURL(url);
+    [[NSNotificationCenter defaultCenter]
+      postNotificationName:RCTJavaScriptWillStartExecutingNotification
+      object:self->_parentBridge userInfo:@{@"bridge": self}];
     if (isRAMBundle(script)) {
       [self->_performanceLogger markStartForTag:RCTPLRAMBundleLoad];
       auto ramBundle = std::make_unique<JSIndexedRAMBundle>(sourceUrlStr.UTF8String);
@@ -1161,53 +1186,6 @@ - (void)executeApplicationScript:(NSData *)script
   }];
 }
 
-- (JSValue *)callFunctionOnModule:(NSString *)module
-                           method:(NSString *)method
-                        arguments:(NSArray *)arguments
-                            error:(NSError **)error
-{
-  if (!_reactInstance) {
-    if (error) {
-      *error = RCTErrorWithMessage(
-        @"callFunctionOnModule was called on uninitialized bridge");
-    }
-    return nil;
-  } else if (self.executorClass) {
-    if (error) {
-      *error = RCTErrorWithMessage(
-        @"callFunctionOnModule can only be used with JSC executor");
-    }
-    return nil;
-  } else if (!self.valid) {
-    if (error) {
-      *error = RCTErrorWithMessage(
-        @"Bridge is no longer valid");
-    }
-    return nil;
-  } else if (self.loading) {
-    if (error) {
-      *error = RCTErrorWithMessage(
-        @"Bridge is still loading");
-    }
-    return nil;
-  }
-
-  RCT_PROFILE_BEGIN_EVENT(0, @"callFunctionOnModule", (@{ @"module": module, @"method": method }));
-  __block JSValue *ret = nil;
-  NSError *errorObj = tryAndReturnError(^{
-    Value result = self->_reactInstance->callFunctionSync([module UTF8String], [method UTF8String], (id)arguments);
-    JSContext *context = contextForGlobalContextRef(JSC_JSContextGetGlobalContext(result.context()));
-    ret = [JSC_JSValue(result.context()) valueWithJSValueRef:result inContext:context];
-  });
-  RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"js_call");
-
-  if (error) {
-    *error = errorObj;
-  }
-
-  return ret;
-}
-
 - (void)registerSegmentWithId:(NSUInteger)segmentId path:(NSString *)path
 {
   if (_reactInstance) {
diff --git a/React/CxxBridge/RCTCxxBridgeDelegate.h b/React/CxxBridge/RCTCxxBridgeDelegate.h
index ad7fc3d45b2a75..cbb56b75a85121 100644
--- a/React/CxxBridge/RCTCxxBridgeDelegate.h
+++ b/React/CxxBridge/RCTCxxBridgeDelegate.h
@@ -1,15 +1,14 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
 
 #import <React/RCTBridgeDelegate.h>
+#import <jschelpers/JavaScriptCore.h>
 
 namespace facebook {
 namespace react {
@@ -32,4 +31,16 @@ class JSExecutorFactory;
  */
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge;
 
+@optional
+
+/**
+ * Experimental: Perform installation of extra JS binding on the given JS context, as appropriate.
+ */
+- (void)installExtraJSBinding:(JSGlobalContextRef)jsContextRef;
+
+/**
+ * Experimental: Get the instance of the extra module/class which gets bound via `installExtraJSBinding:`
+ */
+- (id)jsBoundExtraModuleForClass:(Class)moduleClass;
+
 @end
diff --git a/React/CxxBridge/RCTJSCHelpers.h b/React/CxxBridge/RCTJSCHelpers.h
index 3c3775b31c8acd..38eb26a1dad137 100644
--- a/React/CxxBridge/RCTJSCHelpers.h
+++ b/React/CxxBridge/RCTJSCHelpers.h
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/React/CxxBridge/RCTJSCHelpers.mm b/React/CxxBridge/RCTJSCHelpers.mm
index 39948820853aa3..760c50022aa176 100644
--- a/React/CxxBridge/RCTJSCHelpers.mm
+++ b/React/CxxBridge/RCTJSCHelpers.mm
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTJSCHelpers.h"
diff --git a/React/CxxBridge/RCTMessageThread.h b/React/CxxBridge/RCTMessageThread.h
index e4b83912e4d3ab..d87bb5256f94b7 100644
--- a/React/CxxBridge/RCTMessageThread.h
+++ b/React/CxxBridge/RCTMessageThread.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <string>
diff --git a/React/CxxBridge/RCTMessageThread.mm b/React/CxxBridge/RCTMessageThread.mm
index e3b85ff90c80e4..a1214051db35da 100644
--- a/React/CxxBridge/RCTMessageThread.mm
+++ b/React/CxxBridge/RCTMessageThread.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTMessageThread.h"
diff --git a/React/CxxBridge/RCTObjcExecutor.h b/React/CxxBridge/RCTObjcExecutor.h
index 89cad3cbbf4af4..08a6f922215867 100644
--- a/React/CxxBridge/RCTObjcExecutor.h
+++ b/React/CxxBridge/RCTObjcExecutor.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <functional>
diff --git a/React/CxxBridge/RCTObjcExecutor.mm b/React/CxxBridge/RCTObjcExecutor.mm
index 94c07178969b1b..2f861ffc983ec8 100644
--- a/React/CxxBridge/RCTObjcExecutor.mm
+++ b/React/CxxBridge/RCTObjcExecutor.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTObjcExecutor.h"
@@ -19,6 +17,7 @@
 #import <cxxreact/JSExecutor.h>
 #import <cxxreact/MessageQueueThread.h>
 #import <cxxreact/ModuleRegistry.h>
+#import <cxxreact/RAMBundleRegistry.h>
 #import <folly/json.h>
 
 namespace facebook {
diff --git a/React/CxxModule/DispatchMessageQueueThread.h b/React/CxxModule/DispatchMessageQueueThread.h
index 2877f5800bf6bc..4c8be7b502c675 100644
--- a/React/CxxModule/DispatchMessageQueueThread.h
+++ b/React/CxxModule/DispatchMessageQueueThread.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <React/RCTLog.h>
diff --git a/React/CxxModule/RCTCxxMethod.h b/React/CxxModule/RCTCxxMethod.h
index 85fc2e050a32dd..3d0d6aa9587e6c 100644
--- a/React/CxxModule/RCTCxxMethod.h
+++ b/React/CxxModule/RCTCxxMethod.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/CxxModule/RCTCxxMethod.mm b/React/CxxModule/RCTCxxMethod.mm
index 222c487986f52a..82ee01dce771cb 100644
--- a/React/CxxModule/RCTCxxMethod.mm
+++ b/React/CxxModule/RCTCxxMethod.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTCxxMethod.h"
diff --git a/React/CxxModule/RCTCxxModule.h b/React/CxxModule/RCTCxxModule.h
index 6df9836834a444..7bce985a57b9e2 100644
--- a/React/CxxModule/RCTCxxModule.h
+++ b/React/CxxModule/RCTCxxModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <memory>
diff --git a/React/CxxModule/RCTCxxModule.mm b/React/CxxModule/RCTCxxModule.mm
index 295aac82c257f1..98cd09860cec05 100644
--- a/React/CxxModule/RCTCxxModule.mm
+++ b/React/CxxModule/RCTCxxModule.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTCxxModule.h"
diff --git a/React/CxxModule/RCTCxxUtils.h b/React/CxxModule/RCTCxxUtils.h
index 7c1a6b21231ed1..5e38a8a3a8e5c7 100644
--- a/React/CxxModule/RCTCxxUtils.h
+++ b/React/CxxModule/RCTCxxUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/React/CxxModule/RCTCxxUtils.mm b/React/CxxModule/RCTCxxUtils.mm
index 053f45c0d8f959..2bc43a37c9710e 100644
--- a/React/CxxModule/RCTCxxUtils.mm
+++ b/React/CxxModule/RCTCxxUtils.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTCxxUtils.h"
diff --git a/React/CxxModule/RCTNativeModule.h b/React/CxxModule/RCTNativeModule.h
index 072c5ca2150b06..76e9e406575396 100644
--- a/React/CxxModule/RCTNativeModule.h
+++ b/React/CxxModule/RCTNativeModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTModuleData.h>
diff --git a/React/CxxModule/RCTNativeModule.mm b/React/CxxModule/RCTNativeModule.mm
index 25e62cb330c7f2..077b729789d29b 100644
--- a/React/CxxModule/RCTNativeModule.mm
+++ b/React/CxxModule/RCTNativeModule.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNativeModule.h"
diff --git a/React/CxxUtils/RCTFollyConvert.h b/React/CxxUtils/RCTFollyConvert.h
index c5a16f20cd5eac..589b688da8d9a6 100644
--- a/React/CxxUtils/RCTFollyConvert.h
+++ b/React/CxxUtils/RCTFollyConvert.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/CxxUtils/RCTFollyConvert.mm b/React/CxxUtils/RCTFollyConvert.mm
index 0a728047e0bae0..0c6e08bb568939 100644
--- a/React/CxxUtils/RCTFollyConvert.mm
+++ b/React/CxxUtils/RCTFollyConvert.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTFollyConvert.h"
diff --git a/React/DevSupport/RCTDevLoadingView.h b/React/DevSupport/RCTDevLoadingView.h
index e8fed7ffecf60f..dae01f04577142 100644
--- a/React/DevSupport/RCTDevLoadingView.h
+++ b/React/DevSupport/RCTDevLoadingView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/React/DevSupport/RCTDevLoadingView.m b/React/DevSupport/RCTDevLoadingView.m
index 9872b1a35b7f1b..e7614a896489f4 100644
--- a/React/DevSupport/RCTDevLoadingView.m
+++ b/React/DevSupport/RCTDevLoadingView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDevLoadingView.h"
@@ -73,8 +71,15 @@ - (void)setBridge:(RCTBridge *)bridge
   dispatch_async(dispatch_get_main_queue(), ^{
     self->_showDate = [NSDate date];
     if (!self->_window && !RCTRunningInTestEnvironment()) {
-      CGFloat screenWidth = [UIScreen mainScreen].bounds.size.width;
-      self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenWidth, 22)];
+      CGSize screenSize = [UIScreen mainScreen].bounds.size;
+      if (screenSize.height == 812 /* iPhone X */) {
+        self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, 60)];
+        self->_label = [[UILabel alloc] initWithFrame:CGRectMake(0, 30, self->_window.bounds.size.width, 30)];
+      } else {
+        self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, 22)];
+        self->_label = [[UILabel alloc] initWithFrame:self->_window.bounds];
+      }
+      [self->_window addSubview:self->_label];
 #if TARGET_OS_TV
       self->_window.windowLevel = UIWindowLevelNormal + 1;
 #else
@@ -83,11 +88,8 @@ - (void)setBridge:(RCTBridge *)bridge
       // set a root VC so rotation is supported
       self->_window.rootViewController = [UIViewController new];
 
-      self->_label = [[UILabel alloc] initWithFrame:self->_window.bounds];
       self->_label.font = [UIFont systemFontOfSize:12.0];
       self->_label.textAlignment = NSTextAlignmentCenter;
-
-      [self->_window addSubview:self->_label];
     }
 
     self->_label.text = message;
diff --git a/React/DevSupport/RCTDevMenu.h b/React/DevSupport/RCTDevMenu.h
index c02f9c92e32d67..cd60f87e108be8 100644
--- a/React/DevSupport/RCTDevMenu.h
+++ b/React/DevSupport/RCTDevMenu.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/DevSupport/RCTDevMenu.m b/React/DevSupport/RCTDevMenu.m
index 58b337ff384768..24b2f47e5127a9 100644
--- a/React/DevSupport/RCTDevMenu.m
+++ b/React/DevSupport/RCTDevMenu.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDevMenu.h"
diff --git a/React/DevSupport/RCTPackagerClient.h b/React/DevSupport/RCTPackagerClient.h
index 3b5e38c8766d3d..230d685f4e2a11 100644
--- a/React/DevSupport/RCTPackagerClient.h
+++ b/React/DevSupport/RCTPackagerClient.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTDefines.h>
@@ -14,8 +12,16 @@
 @class RCTPackagerClientResponder;
 @class RCTReconnectingWebSocket;
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 extern const int RCT_PACKAGER_CLIENT_PROTOCOL_VERSION;
 
+#if defined(__cplusplus)
+}
+#endif
+
 @protocol RCTPackagerClientMethod <NSObject>
 
 - (void)handleRequest:(NSDictionary<NSString *, id> *)params withResponder:(RCTPackagerClientResponder *)responder;
diff --git a/React/DevSupport/RCTPackagerClient.m b/React/DevSupport/RCTPackagerClient.m
index e0befe33da8395..a15c01fbe5f3da 100644
--- a/React/DevSupport/RCTPackagerClient.m
+++ b/React/DevSupport/RCTPackagerClient.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPackagerClient.h"
diff --git a/React/DevSupport/RCTPackagerConnection.h b/React/DevSupport/RCTPackagerConnection.h
index 155dd45153aba6..ed3f464b6bdfff 100644
--- a/React/DevSupport/RCTPackagerConnection.h
+++ b/React/DevSupport/RCTPackagerConnection.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/DevSupport/RCTPackagerConnection.mm b/React/DevSupport/RCTPackagerConnection.mm
index 572c14faa25849..10fbca844e3fd0 100644
--- a/React/DevSupport/RCTPackagerConnection.mm
+++ b/React/DevSupport/RCTPackagerConnection.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPackagerConnection.h"
diff --git a/React/Fabric/RCTFabricPlatformUIOperationManager.h b/React/Fabric/RCTFabricPlatformUIOperationManager.h
new file mode 100644
index 00000000000000..2e9df3c770445c
--- /dev/null
+++ b/React/Fabric/RCTFabricPlatformUIOperationManager.h
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#import <memory>
+
+#include <fabric/IFabricPlatformUIOperationManager.h>
+
+@class RCTFabricPlatformUIOperationManager;
+
+namespace facebook {
+namespace react {
+
+/**
+ * Connector class (from C++ to ObjC++) to allow FabricUIManager to invoke native UI operations/updates.
+ * UIKit-related impl doesn't live here, but this class gets passed to the FabricUIManager C++ impl directly.
+ */
+class RCTFabricPlatformUIOperationManagerConnector : public IFabricPlatformUIOperationManager {
+public:
+  RCTFabricPlatformUIOperationManagerConnector();
+  ~RCTFabricPlatformUIOperationManagerConnector();
+
+  void performUIOperation();
+
+private:
+  void *self_;
+  RCTFabricPlatformUIOperationManager *manager_;
+};
+
+} // namespace react
+} // namespace facebook
+
+/**
+ * Actual ObjC++ implementation of the UI operations.
+ */
+@interface RCTFabricPlatformUIOperationManager : NSObject
+
+- (void)performUIOperation;
+
+@end
diff --git a/React/Fabric/RCTFabricPlatformUIOperationManager.mm b/React/Fabric/RCTFabricPlatformUIOperationManager.mm
new file mode 100644
index 00000000000000..3bccc58e051645
--- /dev/null
+++ b/React/Fabric/RCTFabricPlatformUIOperationManager.mm
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTFabricPlatformUIOperationManager.h"
+
+namespace facebook {
+namespace react {
+
+RCTFabricPlatformUIOperationManagerConnector::RCTFabricPlatformUIOperationManagerConnector() {
+  self_ = (__bridge_retained void *)[RCTFabricPlatformUIOperationManager new];
+  manager_ = (__bridge RCTFabricPlatformUIOperationManager *)self_;
+}
+
+RCTFabricPlatformUIOperationManagerConnector::~RCTFabricPlatformUIOperationManagerConnector() {
+  CFRelease(self_);
+  self_ = NULL;
+  manager_ = NULL;
+}
+
+void RCTFabricPlatformUIOperationManagerConnector::performUIOperation() {
+  [manager_ performUIOperation];
+}
+
+} // namespace react
+} // namespace facebook
+
+// -----------------------------------------------------------------------------
+// Start of ObjC++ impl
+// Access UIKit here.
+// -----------------------------------------------------------------------------
+@implementation RCTFabricPlatformUIOperationManager
+
+- (void)dealloc
+{
+  NSLog(@"RCTFabricPlatformUIOperationManager: dealloc()");
+}
+
+- (void)performUIOperation
+{
+  // TODO
+  NSLog(@"RCTFabricPlatformUIOperationManager: performUIOperation()");
+}
+
+@end
diff --git a/React/Fabric/RCTFabricUIManager.h b/React/Fabric/RCTFabricUIManager.h
deleted file mode 100644
index 2228d102990059..00000000000000
--- a/React/Fabric/RCTFabricUIManager.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import <UIKit/UIKit.h>
-
-#import <React/RCTBridge.h>
-#import <React/RCTBridgeModule.h>
-
-@interface RCTFabricUIManager : NSObject<RCTBridgeModule>
-
-@end
diff --git a/React/Fabric/RCTFabricUIManager.mm b/React/Fabric/RCTFabricUIManager.mm
deleted file mode 100644
index e140aa60c3301d..00000000000000
--- a/React/Fabric/RCTFabricUIManager.mm
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import "RCTFabricUIManager.h"
-
-// This file contains experimental placeholders, nothing is finalized.
-@implementation RCTFabricUIManager
-
-@synthesize bridge = _bridge;
-
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, createNode:(int)reactTag
-                                                  viewName:(NSString *)viewName
-                                                   rootTag:(int)rootTag
-                                                     props:(NSDictionary *)props
-                                            instanceHandle:(int)instanceHandleID)
-{
-  return @0;
-}
-
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, cloneNode:(int)nodeID)
-{
-  return @0;
-}
-
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, cloneNodeWithNewChildren:(int)nodeID)
-{
-  return @0;
-}
-
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, cloneNodeWithNewProps:(int)nodeID newProps:(NSDictionary *)newProps)
-{
-  return @0;
-}
-
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, cloneNodeWithNewChildrenAndProps:(int)nodeID newProps:(NSDictionary *)newProps)
-{
-  return @0;
-}
-
-RCT_EXPORT_METHOD(appendChild:(int)parentNodeID child:(int)childNodeID)
-{
-
-}
-
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, createChildSet)
-{
-  return @0;
-}
-
-RCT_EXPORT_METHOD(appendChildToSet:(int)childSetID child:(int)childNodeID)
-{
-}
-
-RCT_EXPORT_METHOD(completeRoot:(int)rootTag childSet:(int)childSetID)
-{
-}
-
-@end
diff --git a/React/Fabric/RCTFabricUIManagerWrapper.h b/React/Fabric/RCTFabricUIManagerWrapper.h
new file mode 100644
index 00000000000000..d40ef78c359cc3
--- /dev/null
+++ b/React/Fabric/RCTFabricUIManagerWrapper.h
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import <memory>
+
+#import <React/RCTBridge.h>
+#import <React/RCTInvalidating.h>
+#import <React/RCTShadowView.h>
+
+namespace facebook {
+namespace react {
+
+class FabricUIManager;
+
+} // namespace react
+} // namespace facebook
+
+using namespace facebook::react;
+
+/**
+ * An ObjC++ wrapper around the C++ FabricUIManager instance, so that the RCTCxxBridge can access it as needed.
+ */
+@interface RCTFabricUIManagerWrapper : NSObject <RCTInvalidating>
+
+- (std::shared_ptr<FabricUIManager>)manager;
+
+@end
+
+@interface RCTBridge (RCTFabricUIManagerWrapper)
+
+/**
+ * To access via the bridge:
+ *
+ *   std::shared_ptr<FabricUIManager> fabricUIManager = [_bridge fabricUIManager];
+ */
+- (std::shared_ptr<FabricUIManager>)fabricUIManager;
+
+@end
diff --git a/React/Fabric/RCTFabricUIManagerWrapper.mm b/React/Fabric/RCTFabricUIManagerWrapper.mm
new file mode 100644
index 00000000000000..892669145d0ae6
--- /dev/null
+++ b/React/Fabric/RCTFabricUIManagerWrapper.mm
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTFabricUIManagerWrapper.h"
+
+#include <fabric/FabricUIManager.h>
+
+#import "RCTFabricPlatformUIOperationManager.h"
+
+// This file contains experimental placeholders, nothing is finalized.
+@implementation RCTFabricUIManagerWrapper
+{
+  std::shared_ptr<FabricUIManager> _manager;
+  std::shared_ptr<IFabricPlatformUIOperationManager> _platformUIOperationManager;
+}
+
+- (instancetype)init
+{
+  self = [super init];
+  if (self) {
+    _platformUIOperationManager = std::make_shared<RCTFabricPlatformUIOperationManagerConnector>();
+    _manager = std::make_shared<FabricUIManager>(_platformUIOperationManager);
+  }
+  return self;
+}
+
+- (std::shared_ptr<FabricUIManager>)manager
+{
+  return _manager;
+}
+
+- (void)invalidate
+{
+}
+
+@end
+
+@implementation RCTBridge (RCTFabricUIManagerWrapper)
+
+- (std::shared_ptr<FabricUIManager>)fabricUIManager
+{
+  RCTFabricUIManagerWrapper *wrapper = [self jsBoundExtraModuleForClass:[RCTFabricUIManagerWrapper class]];
+  if (wrapper) {
+    return [wrapper manager];
+  }
+  return nullptr;
+}
+
+@end
diff --git a/React/Fabric/Surface/RCTFabricSurface.h b/React/Fabric/Surface/RCTFabricSurface.h
new file mode 100644
index 00000000000000..1672a9a86ac6b9
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurface.h
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTSurface.h>
+
+/**
+ * Fabric-compatible RCTSurface implementation.
+ * It may not continue extending from RCTSurface in the future.
+ */
+@interface RCTFabricSurface : RCTSurface
+
+@end
diff --git a/React/Fabric/Surface/RCTFabricSurface.mm b/React/Fabric/Surface/RCTFabricSurface.mm
new file mode 100644
index 00000000000000..bcdaac13129e94
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurface.mm
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTFabricSurface.h"
+
+#import <React/RCTBridge.h>
+
+@implementation RCTFabricSurface
+
+- (void)unmountReactComponentWithBridge:(RCTBridge *)bridge rootViewTag:(NSNumber *)rootViewTag
+{
+  [bridge enqueueJSCall:@"ReactFabric"
+                 method:@"unmountComponentAtNodeAndRemoveContainer"
+                   args:@[rootViewTag]
+             completion:NULL];
+}
+
+@end
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h
new file mode 100644
index 00000000000000..3214426e77d680
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTSurfaceHostingProxyRootView.h>
+
+/**
+ * Fabric-compatible RCTSurfaceHostingProxyRootView implementation.
+ */
+@interface RCTFabricSurfaceHostingProxyRootView : RCTSurfaceHostingProxyRootView
+
+@end
+
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm
new file mode 100644
index 00000000000000..159a63c865e444
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTFabricSurfaceHostingProxyRootView.h"
+
+#import "RCTFabricSurface.h"
+
+@implementation RCTFabricSurfaceHostingProxyRootView
+
+- (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName initialProperties:(NSDictionary *)initialProperties
+{
+  return [[RCTFabricSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+}
+
+@end
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingView.h b/React/Fabric/Surface/RCTFabricSurfaceHostingView.h
new file mode 100644
index 00000000000000..c50fa51acee97a
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingView.h
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTSurfaceHostingView.h>
+
+/**
+ * Fabric-compatible RCTSurfaceHostingView implementation.
+ */
+@interface RCTFabricSurfaceHostingView : RCTSurfaceHostingView
+
+@end
+
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingView.mm b/React/Fabric/Surface/RCTFabricSurfaceHostingView.mm
new file mode 100644
index 00000000000000..395d40afb68e21
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingView.mm
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTFabricSurfaceHostingView.h"
+
+#import "RCTFabricSurface.h"
+
+@implementation RCTFabricSurfaceHostingView
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+{
+  RCTFabricSurface *surface = [[RCTFabricSurface alloc] initWithBridge:bridge
+                                                            moduleName:moduleName
+                                                     initialProperties:initialProperties];
+  return [self initWithSurface:surface];
+}
+
+@end
+
diff --git a/React/Inspector/RCTInspector.h b/React/Inspector/RCTInspector.h
index 1fcba088e4502a..41bd146e003192 100644
--- a/React/Inspector/RCTInspector.h
+++ b/React/Inspector/RCTInspector.h
@@ -15,6 +15,7 @@
 @interface RCTInspectorPage : NSObject
 @property (nonatomic, readonly) NSInteger id;
 @property (nonatomic, readonly) NSString *title;
+@property (nonatomic, readonly) NSString *vm;
 @end
 
 @interface RCTInspector : NSObject
diff --git a/React/Inspector/RCTInspector.mm b/React/Inspector/RCTInspector.mm
index 1cc3d1d3a5b9b9..0bb83db45675ab 100644
--- a/React/Inspector/RCTInspector.mm
+++ b/React/Inspector/RCTInspector.mm
@@ -38,9 +38,11 @@ virtual void onDisconnect() override {
 @interface RCTInspectorPage () {
   NSInteger _id;
   NSString *_title;
+  NSString *_vm;
 }
 - (instancetype)initWithId:(NSInteger)id
-                     title:(NSString *)title;
+                     title:(NSString *)title
+                     vm:(NSString *)vm;
 @end
 
 @interface RCTInspectorLocalConnection () {
@@ -64,7 +66,8 @@ @implementation RCTInspector
   NSMutableArray<RCTInspectorPage *> *array = [NSMutableArray arrayWithCapacity:pages.size()];
   for (size_t i = 0; i < pages.size(); i++) {
     RCTInspectorPage *pageWrapper = [[RCTInspectorPage alloc] initWithId:pages[i].id
-                                                                   title:@(pages[i].title.c_str())];
+                                                                   title:@(pages[i].title.c_str())
+                                                                   vm:@(pages[i].vm.c_str())];
     [array addObject:pageWrapper];
 
   }
@@ -86,10 +89,12 @@ @implementation RCTInspectorPage
 
 - (instancetype)initWithId:(NSInteger)id
                      title:(NSString *)title
+                        vm:(NSString *)vm
 {
   if (self = [super init]) {
     _id = id;
     _title = title;
+    _vm = vm;
   }
   return self;
 }
diff --git a/React/Inspector/RCTInspectorPackagerConnection.m b/React/Inspector/RCTInspectorPackagerConnection.m
index cf1cd2abf557a3..1b2663403ce2e3 100644
--- a/React/Inspector/RCTInspectorPackagerConnection.m
+++ b/React/Inspector/RCTInspectorPackagerConnection.m
@@ -155,6 +155,7 @@ - (NSArray *)pages
       @"id": [@(page.id) stringValue],
       @"title": page.title,
       @"app": [[NSBundle mainBundle] bundleIdentifier],
+      @"vm": page.vm,
       @"isLastBundleDownloadSuccess": bundleStatus == nil
         ? [NSNull null]
         : @(bundleStatus.isLastBundleDownloadSuccess),
diff --git a/React/Modules/RCTAccessibilityManager.h b/React/Modules/RCTAccessibilityManager.h
index 6884894dcccfa0..0e153afbfb7e0e 100644
--- a/React/Modules/RCTAccessibilityManager.h
+++ b/React/Modules/RCTAccessibilityManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTAccessibilityManager.m b/React/Modules/RCTAccessibilityManager.m
index 6434becff7c242..e79fc4232eebb0 100644
--- a/React/Modules/RCTAccessibilityManager.m
+++ b/React/Modules/RCTAccessibilityManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAccessibilityManager.h"
diff --git a/React/Modules/RCTAlertManager.h b/React/Modules/RCTAlertManager.h
index e576329185f60f..7999dd1c09a320 100644
--- a/React/Modules/RCTAlertManager.h
+++ b/React/Modules/RCTAlertManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTAlertManager.m b/React/Modules/RCTAlertManager.m
index c5129af50664ab..b92f915c11373e 100644
--- a/React/Modules/RCTAlertManager.m
+++ b/React/Modules/RCTAlertManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAlertManager.h"
diff --git a/React/Modules/RCTAppState.h b/React/Modules/RCTAppState.h
index 225b14d030bb79..7d56cab63ab34e 100644
--- a/React/Modules/RCTAppState.h
+++ b/React/Modules/RCTAppState.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/React/Modules/RCTAppState.m b/React/Modules/RCTAppState.m
index 9c6d59a19cb715..686e5ab42f5be6 100644
--- a/React/Modules/RCTAppState.m
+++ b/React/Modules/RCTAppState.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAppState.h"
diff --git a/React/Modules/RCTAsyncLocalStorage.h b/React/Modules/RCTAsyncLocalStorage.h
index cbb8cb42bed406..446a54f76218ba 100644
--- a/React/Modules/RCTAsyncLocalStorage.h
+++ b/React/Modules/RCTAsyncLocalStorage.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/React/Modules/RCTAsyncLocalStorage.m b/React/Modules/RCTAsyncLocalStorage.m
index 1064e04f2f8f12..c33ddb25d4a957 100644
--- a/React/Modules/RCTAsyncLocalStorage.m
+++ b/React/Modules/RCTAsyncLocalStorage.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAsyncLocalStorage.h"
diff --git a/React/Modules/RCTClipboard.h b/React/Modules/RCTClipboard.h
index 45ff6e32bf8652..317716816291fb 100644
--- a/React/Modules/RCTClipboard.h
+++ b/React/Modules/RCTClipboard.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/React/Modules/RCTClipboard.m b/React/Modules/RCTClipboard.m
index 8115f5e522c1ff..e624904d7d1059 100644
--- a/React/Modules/RCTClipboard.m
+++ b/React/Modules/RCTClipboard.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTClipboard.h"
diff --git a/React/Modules/RCTDevSettings.h b/React/Modules/RCTDevSettings.h
index e4aa72a065be2a..bdf30324aeb877 100644
--- a/React/Modules/RCTDevSettings.h
+++ b/React/Modules/RCTDevSettings.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridge.h>
diff --git a/React/Modules/RCTDevSettings.mm b/React/Modules/RCTDevSettings.mm
index 7de283c510c318..db61029d8ae892 100644
--- a/React/Modules/RCTDevSettings.mm
+++ b/React/Modules/RCTDevSettings.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDevSettings.h"
diff --git a/React/Modules/RCTDeviceInfo.h b/React/Modules/RCTDeviceInfo.h
index 2ff2ad965d5a08..a21750e7cd4b2a 100644
--- a/React/Modules/RCTDeviceInfo.h
+++ b/React/Modules/RCTDeviceInfo.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTDeviceInfo.m b/React/Modules/RCTDeviceInfo.m
index 6eb028d9bf256e..20e53d55af611f 100644
--- a/React/Modules/RCTDeviceInfo.m
+++ b/React/Modules/RCTDeviceInfo.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDeviceInfo.h"
diff --git a/React/Modules/RCTEventEmitter.h b/React/Modules/RCTEventEmitter.h
index 489b2503962831..3192d473cf07aa 100644
--- a/React/Modules/RCTEventEmitter.h
+++ b/React/Modules/RCTEventEmitter.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridge.h>
diff --git a/React/Modules/RCTEventEmitter.m b/React/Modules/RCTEventEmitter.m
index 4550e2d57eae5e..1b4478566d4776 100644
--- a/React/Modules/RCTEventEmitter.m
+++ b/React/Modules/RCTEventEmitter.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTEventEmitter.h"
diff --git a/React/Modules/RCTExceptionsManager.h b/React/Modules/RCTExceptionsManager.h
index 393d591b2b3824..57e81fb9e4905d 100644
--- a/React/Modules/RCTExceptionsManager.h
+++ b/React/Modules/RCTExceptionsManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTExceptionsManager.m b/React/Modules/RCTExceptionsManager.m
index 3bb2a1d66f92a9..192675bf39af1c 100644
--- a/React/Modules/RCTExceptionsManager.m
+++ b/React/Modules/RCTExceptionsManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTExceptionsManager.h"
diff --git a/React/Modules/RCTI18nManager.h b/React/Modules/RCTI18nManager.h
index d246249577df8d..c99a3b1ac56bcf 100644
--- a/React/Modules/RCTI18nManager.h
+++ b/React/Modules/RCTI18nManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/React/Modules/RCTI18nManager.m b/React/Modules/RCTI18nManager.m
index 72e2ae3a29d1de..4059ea5d85aa70 100644
--- a/React/Modules/RCTI18nManager.m
+++ b/React/Modules/RCTI18nManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTI18nManager.h"
diff --git a/React/Modules/RCTI18nUtil.h b/React/Modules/RCTI18nUtil.h
index 8157f4192ea22f..967e90d4c9089d 100644
--- a/React/Modules/RCTI18nUtil.h
+++ b/React/Modules/RCTI18nUtil.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTI18nUtil.m b/React/Modules/RCTI18nUtil.m
index 9a6eb3b1f06598..804154e2af8251 100644
--- a/React/Modules/RCTI18nUtil.m
+++ b/React/Modules/RCTI18nUtil.m
@@ -1,16 +1,14 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
-#import <Foundation/Foundation.h>
-
 #import "RCTI18nUtil.h"
 
+#import <UIKit/UIKit.h>
+
 @implementation RCTI18nUtil
 
 + (instancetype)sharedInstance
@@ -100,9 +98,8 @@ - (BOOL)isDevicePreferredLanguageRTL
 // Check if the current application language is RTL
 - (BOOL)isApplicationPreferredLanguageRTL
 {
-  NSString *preferredAppLanguage = [[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0];
-  NSLocaleLanguageDirection direction = [NSLocale characterDirectionForLanguage:preferredAppLanguage];
-  return direction == NSLocaleLanguageDirectionRightToLeft;
+  NSWritingDirection direction = [NSParagraphStyle defaultWritingDirectionForLanguage:nil];
+  return direction == NSWritingDirectionRightToLeft;
 }
 
 @end
diff --git a/React/Modules/RCTJSCSamplingProfiler.h b/React/Modules/RCTJSCSamplingProfiler.h
index b1f1d559e7c11f..8facaa674c6ad2 100644
--- a/React/Modules/RCTJSCSamplingProfiler.h
+++ b/React/Modules/RCTJSCSamplingProfiler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTJSCSamplingProfiler.m b/React/Modules/RCTJSCSamplingProfiler.m
index 651fb27ab7a941..1d06e053829591 100644
--- a/React/Modules/RCTJSCSamplingProfiler.m
+++ b/React/Modules/RCTJSCSamplingProfiler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTJSCSamplingProfiler.h"
diff --git a/React/Modules/RCTKeyboardObserver.h b/React/Modules/RCTKeyboardObserver.h
index 5ae5637e35f4bf..891e174225e20f 100644
--- a/React/Modules/RCTKeyboardObserver.h
+++ b/React/Modules/RCTKeyboardObserver.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/React/Modules/RCTKeyboardObserver.m b/React/Modules/RCTKeyboardObserver.m
index 5909e09afacad6..bef74f7fefdf62 100644
--- a/React/Modules/RCTKeyboardObserver.m
+++ b/React/Modules/RCTKeyboardObserver.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTKeyboardObserver.h"
diff --git a/React/Modules/RCTLayoutAnimation.h b/React/Modules/RCTLayoutAnimation.h
index b1cdb782f81ee2..04f966f4d03e3b 100644
--- a/React/Modules/RCTLayoutAnimation.h
+++ b/React/Modules/RCTLayoutAnimation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTLayoutAnimation.m b/React/Modules/RCTLayoutAnimation.m
index 4d5bf29c47c125..9834103feb5083 100644
--- a/React/Modules/RCTLayoutAnimation.m
+++ b/React/Modules/RCTLayoutAnimation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLayoutAnimation.h"
diff --git a/React/Modules/RCTLayoutAnimationGroup.h b/React/Modules/RCTLayoutAnimationGroup.h
index 651e28727623bd..5b4635af718f50 100644
--- a/React/Modules/RCTLayoutAnimationGroup.h
+++ b/React/Modules/RCTLayoutAnimationGroup.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTLayoutAnimationGroup.m b/React/Modules/RCTLayoutAnimationGroup.m
index c85b25f9444309..73db8b68c6b133 100644
--- a/React/Modules/RCTLayoutAnimationGroup.m
+++ b/React/Modules/RCTLayoutAnimationGroup.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLayoutAnimationGroup.h"
diff --git a/React/Modules/RCTRedBox.h b/React/Modules/RCTRedBox.h
index db72279cca1260..29ed3958cefa9f 100644
--- a/React/Modules/RCTRedBox.h
+++ b/React/Modules/RCTRedBox.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTRedBox.m b/React/Modules/RCTRedBox.m
index 71728640d1fa39..0cbd1fc5aced9a 100644
--- a/React/Modules/RCTRedBox.m
+++ b/React/Modules/RCTRedBox.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRedBox.h"
diff --git a/React/Modules/RCTRedBoxExtraDataViewController.h b/React/Modules/RCTRedBoxExtraDataViewController.h
index 484547814476e7..17575a15aca103 100644
--- a/React/Modules/RCTRedBoxExtraDataViewController.h
+++ b/React/Modules/RCTRedBoxExtraDataViewController.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTRedBoxExtraDataViewController.m b/React/Modules/RCTRedBoxExtraDataViewController.m
index 6011bf95873f86..94d371249b9b2e 100644
--- a/React/Modules/RCTRedBoxExtraDataViewController.m
+++ b/React/Modules/RCTRedBoxExtraDataViewController.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRedBoxExtraDataViewController.h"
diff --git a/React/Modules/RCTSourceCode.h b/React/Modules/RCTSourceCode.h
index 29218749fd6487..f0f60cc0d951ad 100644
--- a/React/Modules/RCTSourceCode.h
+++ b/React/Modules/RCTSourceCode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTSourceCode.m b/React/Modules/RCTSourceCode.m
index 4be46582a8b647..1886476bd7552d 100644
--- a/React/Modules/RCTSourceCode.m
+++ b/React/Modules/RCTSourceCode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSourceCode.h"
diff --git a/React/Modules/RCTStatusBarManager.h b/React/Modules/RCTStatusBarManager.h
index 6960da5ec68576..237d3518f0259a 100644
--- a/React/Modules/RCTStatusBarManager.h
+++ b/React/Modules/RCTStatusBarManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTStatusBarManager.m b/React/Modules/RCTStatusBarManager.m
index 82a4fd9f9965d5..18bd5b0a66cd0b 100644
--- a/React/Modules/RCTStatusBarManager.m
+++ b/React/Modules/RCTStatusBarManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTStatusBarManager.h"
diff --git a/React/Modules/RCTTVNavigationEventEmitter.h b/React/Modules/RCTTVNavigationEventEmitter.h
index 5a162effe0cdf5..05b19f1b6f7844 100644
--- a/React/Modules/RCTTVNavigationEventEmitter.h
+++ b/React/Modules/RCTTVNavigationEventEmitter.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTEventEmitter.h"
diff --git a/React/Modules/RCTTVNavigationEventEmitter.m b/React/Modules/RCTTVNavigationEventEmitter.m
index 12d17758401104..3ebe46381d1899 100644
--- a/React/Modules/RCTTVNavigationEventEmitter.m
+++ b/React/Modules/RCTTVNavigationEventEmitter.m
@@ -1,17 +1,15 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTVNavigationEventEmitter.h"
 
 NSString *const RCTTVNavigationEventNotification = @"RCTTVNavigationEventNotification";
 
-static NSString *const TVNavigationEventName = @"onTVNavEvent";
+static NSString *const TVNavigationEventName = @"onHWKeyEvent";
 
 @implementation RCTTVNavigationEventEmitter
 
@@ -46,7 +44,9 @@ - (void)dealloc
 
 - (void)handleTVNavigationEventNotification:(NSNotification *)notif
 {
-  [self sendEventWithName:TVNavigationEventName body:notif.object];
+  if (self.bridge) {
+    [self sendEventWithName:TVNavigationEventName body:notif.object];
+  }
 }
 
 @end
diff --git a/React/Modules/RCTTiming.h b/React/Modules/RCTTiming.h
index 0ccb48ace3fe89..b126dca18d5e5b 100644
--- a/React/Modules/RCTTiming.h
+++ b/React/Modules/RCTTiming.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTTiming.m b/React/Modules/RCTTiming.m
index b04c5e5cfa7f9d..d1dafdc11c9d44 100644
--- a/React/Modules/RCTTiming.m
+++ b/React/Modules/RCTTiming.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTiming.h"
diff --git a/React/Modules/RCTUIManager.h b/React/Modules/RCTUIManager.h
index 1c8a12a5a44510..05308fcfc8bcc4 100644
--- a/React/Modules/RCTUIManager.h
+++ b/React/Modules/RCTUIManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 17127c7264576f..5dcce46588ba58 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUIManager.h"
@@ -479,14 +477,10 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *
 {
   RCTAssertUIManagerQueue();
 
-  // This is nuanced. In the JS thread, we create a new update buffer
-  // `frameTags`/`frames` that is created/mutated in the JS thread. We access
-  // these structures in the UI-thread block. `NSMutableArray` is not thread
-  // safe so we rely on the fact that we never mutate it after it's passed to
-  // the main thread.
-  NSSet<RCTShadowView *> *viewsWithNewFrames = [rootShadowView collectViewsWithUpdatedFrames];
+  NSHashTable<RCTShadowView *> *affectedShadowViews = [NSHashTable weakObjectsHashTable];
+  [rootShadowView layoutWithAffectedShadowViews:affectedShadowViews];
 
-  if (!viewsWithNewFrames.count) {
+  if (!affectedShadowViews.count) {
     // no frame change results in no UI update block
     return nil;
   }
@@ -499,24 +493,25 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *
   } RCTFrameData;
 
   // Construct arrays then hand off to main thread
-  NSUInteger count = viewsWithNewFrames.count;
+  NSUInteger count = affectedShadowViews.count;
   NSMutableArray *reactTags = [[NSMutableArray alloc] initWithCapacity:count];
   NSMutableData *framesData = [[NSMutableData alloc] initWithLength:sizeof(RCTFrameData) * count];
   {
     NSUInteger index = 0;
     RCTFrameData *frameDataArray = (RCTFrameData *)framesData.mutableBytes;
-    for (RCTShadowView *shadowView in viewsWithNewFrames) {
+    for (RCTShadowView *shadowView in affectedShadowViews) {
       reactTags[index] = shadowView.reactTag;
+      RCTLayoutMetrics layoutMetrics = shadowView.layoutMetrics;
       frameDataArray[index++] = (RCTFrameData){
-        shadowView.frame,
-        shadowView.layoutDirection,
+        layoutMetrics.frame,
+        layoutMetrics.layoutDirection,
         shadowView.isNewView,
         shadowView.superview.isNewView,
       };
     }
   }
 
-  for (RCTShadowView *shadowView in viewsWithNewFrames) {
+  for (RCTShadowView *shadowView in affectedShadowViews) {
 
     // We have to do this after we build the parentsAreNew array.
     shadowView.newView = NO;
@@ -524,7 +519,7 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *
     NSNumber *reactTag = shadowView.reactTag;
 
     if (shadowView.onLayout) {
-      CGRect frame = shadowView.frame;
+      CGRect frame = shadowView.layoutMetrics.frame;
       shadowView.onLayout(@{
         @"layout": @{
           @"x": @(frame.origin.x),
@@ -539,7 +534,7 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *
         RCTIsReactRootView(reactTag) &&
         [shadowView isKindOfClass:[RCTRootShadowView class]]
     ) {
-      CGSize contentSize = shadowView.frame.size;
+      CGSize contentSize = shadowView.layoutMetrics.frame.size;
 
       RCTExecuteOnMainQueue(^{
         UIView *view = self->_viewRegistry[reactTag];
@@ -928,21 +923,36 @@ - (void)_manageChildren:(NSNumber *)containerTag
 
   // Dispatch view creation directly to the main thread instead of adding to
   // UIBlocks array. This way, it doesn't get deferred until after layout.
-  __weak RCTUIManager *weakManager = self;
-  RCTExecuteOnMainQueue(^{
-    RCTUIManager *uiManager = weakManager;
-    if (!uiManager) {
+  __block UIView *preliminaryCreatedView = nil;
+
+  void (^createViewBlock)(void) = ^{
+    // Do nothing on the second run.
+    if (preliminaryCreatedView) {
       return;
     }
-    UIView *view = [componentData createViewWithTag:reactTag];
-    if (view) {
-      uiManager->_viewRegistry[reactTag] = view;
+
+    preliminaryCreatedView = [componentData createViewWithTag:reactTag];
+
+    if (preliminaryCreatedView) {
+      self->_viewRegistry[reactTag] = preliminaryCreatedView;
     }
-  });
+  };
 
-  [self addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    UIView *view = viewRegistry[reactTag];
-    [componentData setProps:props forView:view];
+  // We cannot guarantee that asynchronously scheduled block will be executed
+  // *before* a block is added to the regular mounting process (simply because
+  // mounting process can be managed externally while the main queue is
+  // locked).
+  // So, we positively dispatch it asynchronously and double check inside
+  // the regular mounting block.
+
+  RCTExecuteOnMainQueue(createViewBlock);
+
+  [self addUIBlock:^(__unused RCTUIManager *uiManager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    createViewBlock();
+
+    if (preliminaryCreatedView) {
+      [componentData setProps:props forView:preliminaryCreatedView];
+    }
   }];
 
   [self _shadowView:shadowView didReceiveUpdatedProps:[props allKeys]];
@@ -1071,21 +1081,36 @@ - (void)flushUIBlocksWithCompletion:(void (^)(void))completion;
     return;
   }
 
-  // Execute the previously queued UI blocks
-  RCTProfileBeginFlowEvent();
-  RCTExecuteOnMainQueue(^{
-    RCTProfileEndFlowEvent();
-    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[UIManager flushUIBlocks]", (@{
-      @"count": [@(previousPendingUIBlocks.count) stringValue],
-    }));
+  __weak typeof(self) weakSelf = self;
+
+   void (^mountingBlock)(void) = ^{
+    typeof(self) strongSelf = weakSelf;
+
     @try {
       for (RCTViewManagerUIBlock block in previousPendingUIBlocks) {
-        block(self, self->_viewRegistry);
+        block(strongSelf, strongSelf->_viewRegistry);
       }
     }
     @catch (NSException *exception) {
       RCTLogError(@"Exception thrown while executing UI block: %@", exception);
     }
+  };
+
+  if ([self.observerCoordinator uiManager:self performMountingWithBlock:mountingBlock]) {
+    completion();
+    return;
+  }
+
+  // Execute the previously queued UI blocks
+  RCTProfileBeginFlowEvent();
+  RCTExecuteOnMainQueue(^{
+    RCTProfileEndFlowEvent();
+    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[UIManager flushUIBlocks]", (@{
+      @"count": [@(previousPendingUIBlocks.count) stringValue],
+    }));
+
+    mountingBlock();
+
     RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 
     RCTExecuteOnUIManagerQueue(completion);
diff --git a/React/Modules/RCTUIManagerObserverCoordinator.h b/React/Modules/RCTUIManagerObserverCoordinator.h
index ea07f796f9488c..fc40640270af37 100644
--- a/React/Modules/RCTUIManagerObserverCoordinator.h
+++ b/React/Modules/RCTUIManagerObserverCoordinator.h
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
 
 #import <React/RCTViewManager.h>
 
+typedef dispatch_block_t RCTUIManagerMountingBlock;
+
 /**
  * Allows hooking into UIManager internals. This can be used to execute code at
  * specific points during the view updating process.
@@ -45,6 +45,13 @@
  */
 - (void)uiManagerWillPerformMounting:(RCTUIManager *)manager;
 
+/**
+ * Called right before flushing UI blocks and allows to intercept the mounting process.
+ * Return `YES` to cancel default execution of the `block` (and perform the
+ * execution later).
+ */
+- (BOOL)uiManager:(RCTUIManager *)manager performMountingWithBlock:(RCTUIManagerMountingBlock)block;
+
 /**
  * Called just after flushing UI blocks.
  * This is called from the UIManager queue.
diff --git a/React/Modules/RCTUIManagerObserverCoordinator.mm b/React/Modules/RCTUIManagerObserverCoordinator.mm
index 86d68c73c6ce35..a8fa5f6db3b048 100644
--- a/React/Modules/RCTUIManagerObserverCoordinator.mm
+++ b/React/Modules/RCTUIManagerObserverCoordinator.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUIManagerObserverCoordinator.h"
@@ -74,6 +72,20 @@ - (void)uiManagerWillPerformMounting:(RCTUIManager *)manager
   }
 }
 
+- (BOOL)uiManager:(RCTUIManager *)manager performMountingWithBlock:(RCTUIManagerMountingBlock)block
+{
+  std::lock_guard<std::mutex> lock(_mutex);
+
+  for (id<RCTUIManagerObserver> observer in _observers) {
+    if ([observer respondsToSelector:@selector(uiManager:performMountingWithBlock:)]) {
+      if ([observer uiManager:manager performMountingWithBlock:block]) {
+        return YES;
+      }
+    }
+  }
+  return NO;
+}
+
 - (void)uiManagerDidPerformMounting:(RCTUIManager *)manager
 {
   std::lock_guard<std::mutex> lock(_mutex);
diff --git a/React/Modules/RCTUIManagerUtils.h b/React/Modules/RCTUIManagerUtils.h
index 5858255f2c3f79..c063ab8f51ec7c 100644
--- a/React/Modules/RCTUIManagerUtils.h
+++ b/React/Modules/RCTUIManagerUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTUIManagerUtils.m b/React/Modules/RCTUIManagerUtils.m
index b6c79baa8912dd..a62445650c4625 100644
--- a/React/Modules/RCTUIManagerUtils.m
+++ b/React/Modules/RCTUIManagerUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUIManagerUtils.h"
diff --git a/React/Profiler/RCTFPSGraph.h b/React/Profiler/RCTFPSGraph.h
index 7179cb9cb57d36..a71ac9ab33f400 100644
--- a/React/Profiler/RCTFPSGraph.h
+++ b/React/Profiler/RCTFPSGraph.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Profiler/RCTFPSGraph.m b/React/Profiler/RCTFPSGraph.m
index 0b1d1e5ed85ea7..6b22ef349f4c61 100644
--- a/React/Profiler/RCTFPSGraph.m
+++ b/React/Profiler/RCTFPSGraph.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTFPSGraph.h"
diff --git a/React/Profiler/RCTMacros.h b/React/Profiler/RCTMacros.h
index 0df0ba62aeb90c..ea4c5f40e8c521 100644
--- a/React/Profiler/RCTMacros.h
+++ b/React/Profiler/RCTMacros.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #define _CONCAT(A, B) A##B
diff --git a/React/Profiler/RCTPerfMonitor.m b/React/Profiler/RCTPerfMonitor.m
index 9751935aeabd7d..768142437b0bd5 100644
--- a/React/Profiler/RCTPerfMonitor.m
+++ b/React/Profiler/RCTPerfMonitor.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDefines.h"
diff --git a/React/Profiler/RCTProfile.h b/React/Profiler/RCTProfile.h
index b0ab6cd8127198..88ff3d41f32ff4 100644
--- a/React/Profiler/RCTProfile.h
+++ b/React/Profiler/RCTProfile.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
index 1c94a3b6709526..3b255505800c1f 100644
--- a/React/Profiler/RCTProfile.m
+++ b/React/Profiler/RCTProfile.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTProfile.h"
diff --git a/React/Profiler/RCTProfileTrampoline-arm.S b/React/Profiler/RCTProfileTrampoline-arm.S
index aa622bbd0d7c6b..d4061fed883199 100644
--- a/React/Profiler/RCTProfileTrampoline-arm.S
+++ b/React/Profiler/RCTProfileTrampoline-arm.S
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTDefines.h"
diff --git a/React/Profiler/RCTProfileTrampoline-arm64.S b/React/Profiler/RCTProfileTrampoline-arm64.S
index e513696870551e..af4733b5bf6331 100644
--- a/React/Profiler/RCTProfileTrampoline-arm64.S
+++ b/React/Profiler/RCTProfileTrampoline-arm64.S
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTDefines.h"
diff --git a/React/Profiler/RCTProfileTrampoline-i386.S b/React/Profiler/RCTProfileTrampoline-i386.S
index d1adf1a0898ecd..a33e8a21f2c752 100644
--- a/React/Profiler/RCTProfileTrampoline-i386.S
+++ b/React/Profiler/RCTProfileTrampoline-i386.S
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTDefines.h"
diff --git a/React/Profiler/RCTProfileTrampoline-x86_64.S b/React/Profiler/RCTProfileTrampoline-x86_64.S
index 21072d84241906..d687214193adce 100644
--- a/React/Profiler/RCTProfileTrampoline-x86_64.S
+++ b/React/Profiler/RCTProfileTrampoline-x86_64.S
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTDefines.h"
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index 06ba51997b59bd..1ec79122f44a68 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -334,6 +334,9 @@
 		352DCFF01D19F4C20056D623 /* RCTI18nUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 352DCFEF1D19F4C20056D623 /* RCTI18nUtil.m */; };
 		369123E11DDC75850095B341 /* RCTJSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */; };
 		391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; };
+		39C50FF92046EACF00CEE534 /* RCTVersion.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 199B8A6E1F44DB16005DEF67 /* RCTVersion.h */; };
+		39C50FFB2046EE3500CEE534 /* RCTVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 39C50FFA2046EE3500CEE534 /* RCTVersion.m */; };
+		39C50FFC2046EE3500CEE534 /* RCTVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 39C50FFA2046EE3500CEE534 /* RCTVersion.m */; };
 		3D05745A1DE5FFF500184BB4 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; };
 		3D0B84221EC0B3F600B2BD8E /* RCTResizeMode.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0851DE4F3A000E03CC6 /* RCTResizeMode.h */; };
 		3D0B84231EC0B40D00B2BD8E /* RCTImageLoader.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0831DE4F3A000E03CC6 /* RCTImageLoader.h */; };
@@ -952,6 +955,14 @@
 		3DFE0D1C1DF8575800459392 /* Yoga.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77081DF767AF001F9587 /* Yoga.h */; };
 		3EDCA8A51D3591E700450C31 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
 		5335D5411FE81A4700883D58 /* RCTShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5335D5401FE81A4700883D58 /* RCTShadowView.m */; };
+		53438962203905BB008E0CB3 /* YGLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5343895E203905B6008E0CB3 /* YGLayout.cpp */; };
+		53438963203905BC008E0CB3 /* YGLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5343895E203905B6008E0CB3 /* YGLayout.cpp */; };
+		53438964203905BF008E0CB3 /* YGLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 5343895F203905B6008E0CB3 /* YGLayout.h */; };
+		53438965203905C0008E0CB3 /* YGLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 5343895F203905B6008E0CB3 /* YGLayout.h */; };
+		5352C5752038FF9500A3B97E /* YGStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5352C5722038FF8D00A3B97E /* YGStyle.cpp */; };
+		5352C5762038FF9700A3B97E /* YGStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5352C5722038FF8D00A3B97E /* YGStyle.cpp */; };
+		5352C5772038FF9A00A3B97E /* YGStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5352C5712038FF8D00A3B97E /* YGStyle.h */; };
+		5352C5782038FF9B00A3B97E /* YGStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5352C5712038FF8D00A3B97E /* YGStyle.h */; };
 		53756E3B2004FFFA00FBBD99 /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53756E372004FFF700FBBD99 /* Utils.cpp */; };
 		53756E3C2004FFFC00FBBD99 /* Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 53756E382004FFF700FBBD99 /* Utils.h */; };
 		53756E3D2004FFFE00FBBD99 /* Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 53756E382004FFF700FBBD99 /* Utils.h */; };
@@ -978,6 +989,12 @@
 		590D7BFE1EBD458B00D8A370 /* RCTShadowView+Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 590D7BFB1EBD458B00D8A370 /* RCTShadowView+Layout.h */; };
 		590D7BFF1EBD458B00D8A370 /* RCTShadowView+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = 590D7BFC1EBD458B00D8A370 /* RCTShadowView+Layout.m */; };
 		590D7C001EBD458B00D8A370 /* RCTShadowView+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = 590D7BFC1EBD458B00D8A370 /* RCTShadowView+Layout.m */; };
+		591F78DA202ADB22004A668C /* RCTLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 591F78D8202ADB21004A668C /* RCTLayout.m */; };
+		591F78DB202ADB22004A668C /* RCTLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 591F78D8202ADB21004A668C /* RCTLayout.m */; };
+		591F78DC202ADB22004A668C /* RCTLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 591F78D9202ADB22004A668C /* RCTLayout.h */; };
+		591F78DD202ADB22004A668C /* RCTLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 591F78D9202ADB22004A668C /* RCTLayout.h */; };
+		591F78DE202ADB8F004A668C /* RCTLayout.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 591F78D9202ADB22004A668C /* RCTLayout.h */; };
+		591F78DF202ADB97004A668C /* RCTLayout.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 591F78D9202ADB22004A668C /* RCTLayout.h */; };
 		5925356A20084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5925356920084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm */; };
 		5925356B20084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5925356920084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm */; };
 		59283CA01FD67321000EAAB9 /* RCTSurfaceStage.m in Sources */ = {isa = PBXBuildFile; fileRef = 59283C9F1FD67320000EAAB9 /* RCTSurfaceStage.m */; };
@@ -1347,6 +1364,7 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
+				591F78DF202ADB97004A668C /* RCTLayout.h in Copy Headers */,
 				59EDBCC31FDF4E55003573DE /* RCTScrollableProtocol.h in Copy Headers */,
 				59EDBCC41FDF4E55003573DE /* (null) in Copy Headers */,
 				59EDBCC51FDF4E55003573DE /* RCTScrollContentView.h in Copy Headers */,
@@ -1574,6 +1592,8 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
+				39C50FF92046EACF00CEE534 /* RCTVersion.h in Copy Headers */,
+				591F78DE202ADB8F004A668C /* RCTLayout.h in Copy Headers */,
 				59EDBCBD1FDF4E43003573DE /* RCTScrollableProtocol.h in Copy Headers */,
 				59EDBCBE1FDF4E43003573DE /* (null) in Copy Headers */,
 				59EDBCBF1FDF4E43003573DE /* RCTScrollContentView.h in Copy Headers */,
@@ -2043,6 +2063,7 @@
 		369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJSCSamplingProfiler.m; sourceTree = "<group>"; };
 		391E86A21C623EC800009732 /* RCTTouchEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTouchEvent.m; sourceTree = "<group>"; };
 		391E86A31C623EC800009732 /* RCTTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTouchEvent.h; sourceTree = "<group>"; };
+		39C50FFA2046EE3500CEE534 /* RCTVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVersion.m; sourceTree = "<group>"; };
 		3D0B84281EC0B49400B2BD8E /* RCTTVRemoteHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVRemoteHandler.h; sourceTree = "<group>"; };
 		3D0B84291EC0B49400B2BD8E /* RCTTVRemoteHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVRemoteHandler.m; sourceTree = "<group>"; };
 		3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVNavigationEventEmitter.h; sourceTree = "<group>"; };
@@ -2136,6 +2157,10 @@
 		3EDCA8A31D3591E700450C31 /* RCTErrorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorInfo.h; sourceTree = "<group>"; };
 		3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTErrorInfo.m; sourceTree = "<group>"; };
 		5335D5401FE81A4700883D58 /* RCTShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowView.m; sourceTree = "<group>"; };
+		5343895E203905B6008E0CB3 /* YGLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YGLayout.cpp; sourceTree = "<group>"; };
+		5343895F203905B6008E0CB3 /* YGLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGLayout.h; sourceTree = "<group>"; };
+		5352C5712038FF8D00A3B97E /* YGStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGStyle.h; sourceTree = "<group>"; };
+		5352C5722038FF8D00A3B97E /* YGStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YGStyle.cpp; sourceTree = "<group>"; };
 		53756E372004FFF700FBBD99 /* Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utils.cpp; sourceTree = "<group>"; };
 		53756E382004FFF700FBBD99 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
 		5376C5E01FC6DDB20083513D /* YGNodePrint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGNodePrint.h; sourceTree = "<group>"; };
@@ -2156,6 +2181,8 @@
 		58C571C01AA56C1900CDF9C8 /* RCTDatePickerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDatePickerManager.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		590D7BFB1EBD458B00D8A370 /* RCTShadowView+Layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTShadowView+Layout.h"; sourceTree = "<group>"; };
 		590D7BFC1EBD458B00D8A370 /* RCTShadowView+Layout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTShadowView+Layout.m"; sourceTree = "<group>"; };
+		591F78D8202ADB21004A668C /* RCTLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTLayout.m; sourceTree = "<group>"; };
+		591F78D9202ADB22004A668C /* RCTLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTLayout.h; sourceTree = "<group>"; };
 		5925356920084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTSurfaceSizeMeasureMode.mm; sourceTree = "<group>"; };
 		59283C9F1FD67320000EAAB9 /* RCTSurfaceStage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSurfaceStage.m; sourceTree = "<group>"; };
 		594F0A2F1FD23228007FBE96 /* RCTSurfaceHostingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSurfaceHostingView.h; sourceTree = "<group>"; };
@@ -2322,6 +2349,10 @@
 		130A77021DF767AF001F9587 /* yoga */ = {
 			isa = PBXGroup;
 			children = (
+				5343895E203905B6008E0CB3 /* YGLayout.cpp */,
+				5343895F203905B6008E0CB3 /* YGLayout.h */,
+				5352C5722038FF8D00A3B97E /* YGStyle.cpp */,
+				5352C5712038FF8D00A3B97E /* YGStyle.h */,
 				53756E372004FFF700FBBD99 /* Utils.cpp */,
 				53756E382004FFF700FBBD99 /* Utils.h */,
 				53EC85DF1FDEC75A0051B2B5 /* YGNode.cpp */,
@@ -2536,6 +2567,8 @@
 				58C571BF1AA56C1900CDF9C8 /* RCTDatePickerManager.m */,
 				3D37B5801D522B190042D5B5 /* RCTFont.h */,
 				3D37B5811D522B190042D5B5 /* RCTFont.mm */,
+				591F78D9202ADB22004A668C /* RCTLayout.h */,
+				591F78D8202ADB21004A668C /* RCTLayout.m */,
 				66CD94AD1F1045E700CB3C7C /* RCTMaskedView.h */,
 				66CD94AE1F1045E700CB3C7C /* RCTMaskedView.m */,
 				66CD94AF1F1045E700CB3C7C /* RCTMaskedViewManager.h */,
@@ -2969,6 +3002,7 @@
 				83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */,
 				83CBBA501A601E3B00E9B192 /* RCTUtils.m */,
 				199B8A6E1F44DB16005DEF67 /* RCTVersion.h */,
+				39C50FFA2046EE3500CEE534 /* RCTVersion.m */,
 				599FAA291FB274970058CCF6 /* Surface */,
 			);
 			path = Base;
@@ -3151,6 +3185,7 @@
 				3D302F4A1DF828F800D6DDAE /* RCTRootViewInternal.h in Headers */,
 				59EDBCB21FDF4E0C003573DE /* (null) in Headers */,
 				3D302F4B1DF828F800D6DDAE /* RCTTouchEvent.h in Headers */,
+				591F78DD202ADB22004A668C /* RCTLayout.h in Headers */,
 				59D031F21F8353D3008361F0 /* RCTSafeAreaView.h in Headers */,
 				3D302F4C1DF828F800D6DDAE /* RCTTouchHandler.h in Headers */,
 				3D302F4D1DF828F800D6DDAE /* RCTURLRequestDelegate.h in Headers */,
@@ -3255,6 +3290,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5352C5782038FF9B00A3B97E /* YGStyle.h in Headers */,
 				53EC85E41FDEC7630051B2B5 /* YGNode.h in Headers */,
 				53D1239F1FBF1EFB001B8A10 /* Yoga-internal.h in Headers */,
 				3DFE0D161DF8574D00459392 /* YGEnums.h in Headers */,
@@ -3262,6 +3298,7 @@
 				53756E3D2004FFFE00FBBD99 /* Utils.h in Headers */,
 				5376C5E71FC6DDC20083513D /* YGNodePrint.h in Headers */,
 				3DFE0D191DF8574D00459392 /* Yoga.h in Headers */,
+				53438965203905C0008E0CB3 /* YGLayout.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3333,6 +3370,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5352C5772038FF9A00A3B97E /* YGStyle.h in Headers */,
 				53EC85E51FDEC7630051B2B5 /* YGNode.h in Headers */,
 				53D1239E1FBF1EFB001B8A10 /* Yoga-internal.h in Headers */,
 				133957881DF76D3500EC27BE /* YGEnums.h in Headers */,
@@ -3340,6 +3378,7 @@
 				53756E3C2004FFFC00FBBD99 /* Utils.h in Headers */,
 				5376C5E61FC6DDC10083513D /* YGNodePrint.h in Headers */,
 				133957891DF76D3500EC27BE /* YGMacros.h in Headers */,
+				53438964203905BF008E0CB3 /* YGLayout.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3511,6 +3550,7 @@
 				C60128AB1F3D1258009DF9FF /* RCTCxxConvert.h in Headers */,
 				59EDBCAD1FDF4E0C003573DE /* RCTScrollContentView.h in Headers */,
 				59EDBCA71FDF4E0C003573DE /* RCTScrollableProtocol.h in Headers */,
+				591F78DC202ADB22004A668C /* RCTLayout.h in Headers */,
 				3D80DA631DF820620028D040 /* RCTBorderDrawing.h in Headers */,
 				3D80DA641DF820620028D040 /* RCTBorderStyle.h in Headers */,
 				3D80DA651DF820620028D040 /* RCTComponent.h in Headers */,
@@ -4119,6 +4159,7 @@
 				5960C1BC1F0804A00066FD5B /* RCTLayoutAnimationGroup.m in Sources */,
 				2D3B5ECF1D9B096F00451313 /* RCTFont.mm in Sources */,
 				2D3B5ED51D9B098000451313 /* RCTModalHostViewController.m in Sources */,
+				39C50FFC2046EE3500CEE534 /* RCTVersion.m in Sources */,
 				2D3B5EBC1D9B092600451313 /* RCTKeyboardObserver.m in Sources */,
 				657734931EE8356100A0E9EA /* RCTInspector.mm in Sources */,
 				59EB6DBE1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm in Sources */,
@@ -4184,6 +4225,7 @@
 				59D031F41F8353D3008361F0 /* RCTSafeAreaView.m in Sources */,
 				2D3B5E941D9B087900451313 /* RCTBundleURLProvider.m in Sources */,
 				2D3B5EB81D9B091B00451313 /* RCTSourceCode.m in Sources */,
+				591F78DB202ADB22004A668C /* RCTLayout.m in Sources */,
 				2D3B5EB51D9B091100451313 /* RCTDevMenu.m in Sources */,
 				59EDBCAC1FDF4E0C003573DE /* (null) in Sources */,
 				2D3B5EBD1D9B092A00451313 /* RCTTiming.m in Sources */,
@@ -4277,9 +4319,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				53D123A01FBF1EFF001B8A10 /* Yoga.cpp in Sources */,
+				5352C5752038FF9500A3B97E /* YGStyle.cpp in Sources */,
 				53EC85E21FDEC75F0051B2B5 /* YGNode.cpp in Sources */,
 				53D1239A1FBF1EF2001B8A10 /* YGEnums.cpp in Sources */,
 				53756E3B2004FFFA00FBBD99 /* Utils.cpp in Sources */,
+				53438962203905BB008E0CB3 /* YGLayout.cpp in Sources */,
 				5376C5E41FC6DDBC0083513D /* YGNodePrint.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4289,9 +4333,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				53D123A11FBF1EFF001B8A10 /* Yoga.cpp in Sources */,
+				5352C5762038FF9700A3B97E /* YGStyle.cpp in Sources */,
 				53EC85E31FDEC75F0051B2B5 /* YGNode.cpp in Sources */,
 				53D1239B1FBF1EF4001B8A10 /* YGEnums.cpp in Sources */,
 				53756E3E2005000300FBBD99 /* Utils.cpp in Sources */,
+				53438963203905BC008E0CB3 /* YGLayout.cpp in Sources */,
 				5376C5E51FC6DDBD0083513D /* YGNodePrint.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4428,6 +4474,7 @@
 				13D9FEEB1CDCCECF00158BD7 /* RCTEventEmitter.m in Sources */,
 				599FAA3E1FB274980058CCF6 /* RCTSurfaceRootShadowView.m in Sources */,
 				AC70D2E91DE489E4002E6351 /* RCTJavaScriptLoader.mm in Sources */,
+				39C50FFB2046EE3500CEE534 /* RCTVersion.m in Sources */,
 				14F7A0EC1BDA3B3C003C6C10 /* RCTPerfMonitor.m in Sources */,
 				5960C1B71F0804A00066FD5B /* RCTLayoutAnimation.m in Sources */,
 				13134C9E1E296B2A00B9F3CB /* RCTCxxModule.mm in Sources */,
@@ -4452,6 +4499,7 @@
 				1372B70A1AB030C200659ED6 /* RCTAppState.m in Sources */,
 				59A7B9FE1E577DBF0068EDBF /* RCTRootContentView.m in Sources */,
 				13E067591A70F44B002CDEE1 /* UIView+React.m in Sources */,
+				591F78DA202ADB22004A668C /* RCTLayout.m in Sources */,
 				FEFAAC9E1FDB89B50057BBE0 /* RCTRedBoxExtraDataViewController.m in Sources */,
 				14F484561AABFCE100FDF6B9 /* RCTSliderManager.m in Sources */,
 				CF2731C11E7B8DE40044CA4F /* RCTDeviceInfo.m in Sources */,
diff --git a/React/UIUtils/RCTUIUtils.h b/React/UIUtils/RCTUIUtils.h
index 5f6f0e02228969..02e57abaf023b6 100644
--- a/React/UIUtils/RCTUIUtils.h
+++ b/React/UIUtils/RCTUIUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
diff --git a/React/UIUtils/RCTUIUtils.m b/React/UIUtils/RCTUIUtils.m
index ad9d44dd474169..17d8a8567278cb 100644
--- a/React/UIUtils/RCTUIUtils.m
+++ b/React/UIUtils/RCTUIUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUIUtils.h"
diff --git a/React/Views/RCTActivityIndicatorView.h b/React/Views/RCTActivityIndicatorView.h
index ae802a448efb42..580ae77816dc27 100644
--- a/React/Views/RCTActivityIndicatorView.h
+++ b/React/Views/RCTActivityIndicatorView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTActivityIndicatorView.m b/React/Views/RCTActivityIndicatorView.m
index 29ce6dbc3fa990..1fa29d15111b5b 100644
--- a/React/Views/RCTActivityIndicatorView.m
+++ b/React/Views/RCTActivityIndicatorView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTActivityIndicatorView.h"
diff --git a/React/Views/RCTActivityIndicatorViewManager.h b/React/Views/RCTActivityIndicatorViewManager.h
index 67bc20984feaa0..9871a9d7d67be4 100644
--- a/React/Views/RCTActivityIndicatorViewManager.h
+++ b/React/Views/RCTActivityIndicatorViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTActivityIndicatorViewManager.m b/React/Views/RCTActivityIndicatorViewManager.m
index c28b86983b3c22..2ba37a2288e8a7 100644
--- a/React/Views/RCTActivityIndicatorViewManager.m
+++ b/React/Views/RCTActivityIndicatorViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTActivityIndicatorViewManager.h"
diff --git a/React/Views/RCTAnimationType.h b/React/Views/RCTAnimationType.h
index 0f2703ea6b3295..fb3ddc3c83c8d0 100644
--- a/React/Views/RCTAnimationType.h
+++ b/React/Views/RCTAnimationType.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTAutoInsetsProtocol.h b/React/Views/RCTAutoInsetsProtocol.h
index 8e7c72c8054adc..934f4702ae8ced 100644
--- a/React/Views/RCTAutoInsetsProtocol.h
+++ b/React/Views/RCTAutoInsetsProtocol.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTBorderDrawing.h b/React/Views/RCTBorderDrawing.h
index 3835359da7c147..089f92fa01ca23 100644
--- a/React/Views/RCTBorderDrawing.h
+++ b/React/Views/RCTBorderDrawing.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTBorderDrawing.m b/React/Views/RCTBorderDrawing.m
index ec85e92c4d68ec..7674f1d154f8ef 100644
--- a/React/Views/RCTBorderDrawing.m
+++ b/React/Views/RCTBorderDrawing.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBorderDrawing.h"
diff --git a/React/Views/RCTBorderStyle.h b/React/Views/RCTBorderStyle.h
index 470d832314b711..c3d7acdfbe4cea 100644
--- a/React/Views/RCTBorderStyle.h
+++ b/React/Views/RCTBorderStyle.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTComponent.h b/React/Views/RCTComponent.h
index 499bd9e0e48a78..639c220dca0534 100644
--- a/React/Views/RCTComponent.h
+++ b/React/Views/RCTComponent.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
diff --git a/React/Views/RCTComponentData.h b/React/Views/RCTComponentData.h
index 633fd7139d27bc..f2080992bc4a6e 100644
--- a/React/Views/RCTComponentData.h
+++ b/React/Views/RCTComponentData.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTComponentData.m b/React/Views/RCTComponentData.m
index 976d9fb2054cf6..06bfdbaf2c2501 100644
--- a/React/Views/RCTComponentData.m
+++ b/React/Views/RCTComponentData.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTComponentData.h"
diff --git a/React/Views/RCTConvert+CoreLocation.h b/React/Views/RCTConvert+CoreLocation.h
index 7191e384a92e3e..bfe61029ebc723 100644
--- a/React/Views/RCTConvert+CoreLocation.h
+++ b/React/Views/RCTConvert+CoreLocation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreLocation/CoreLocation.h>
diff --git a/React/Views/RCTConvert+CoreLocation.m b/React/Views/RCTConvert+CoreLocation.m
index 505a6aba3f3368..67607b1520db94 100644
--- a/React/Views/RCTConvert+CoreLocation.m
+++ b/React/Views/RCTConvert+CoreLocation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert+CoreLocation.h"
diff --git a/React/Views/RCTConvert+Transform.h b/React/Views/RCTConvert+Transform.h
index 29c65823bcb26c..c07fac3c159970 100644
--- a/React/Views/RCTConvert+Transform.h
+++ b/React/Views/RCTConvert+Transform.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert.h"
diff --git a/React/Views/RCTConvert+Transform.m b/React/Views/RCTConvert+Transform.m
index 1625a4917d30e7..bd5b144905206d 100644
--- a/React/Views/RCTConvert+Transform.m
+++ b/React/Views/RCTConvert+Transform.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert+Transform.h"
diff --git a/React/Views/RCTDatePicker.h b/React/Views/RCTDatePicker.h
index f036651b427edc..2b2759575a3322 100644
--- a/React/Views/RCTDatePicker.h
+++ b/React/Views/RCTDatePicker.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTDatePicker.m b/React/Views/RCTDatePicker.m
index 0e392dcec1e156..664d15b202e86b 100644
--- a/React/Views/RCTDatePicker.m
+++ b/React/Views/RCTDatePicker.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDatePicker.h"
diff --git a/React/Views/RCTDatePickerManager.h b/React/Views/RCTDatePickerManager.h
index df964a0ca0c035..0693b34afe8044 100644
--- a/React/Views/RCTDatePickerManager.h
+++ b/React/Views/RCTDatePickerManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/React/Views/RCTDatePickerManager.m b/React/Views/RCTDatePickerManager.m
index 6c70c76c1c23cb..cd1138626596e2 100644
--- a/React/Views/RCTDatePickerManager.m
+++ b/React/Views/RCTDatePickerManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDatePickerManager.h"
diff --git a/React/Views/RCTFont.h b/React/Views/RCTFont.h
index ba34e8f3462b9c..e812f69df353e5 100644
--- a/React/Views/RCTFont.h
+++ b/React/Views/RCTFont.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
@@ -20,6 +18,7 @@ typedef UIFont *(^RCTFontHandler)(CGFloat fontSize, NSString *fontWeightDescript
  * "semibold", "extrabold", "bold", "heavy", or "black".
  */
 RCT_EXTERN void RCTSetDefaultFontHandler(RCTFontHandler handler);
+RCT_EXTERN BOOL RCTHasFontHandlerSet();
 
 @interface RCTFont : NSObject
 
diff --git a/React/Views/RCTFont.mm b/React/Views/RCTFont.mm
index 37595dd3fbf42c..3fb3e36177cd19 100644
--- a/React/Views/RCTFont.mm
+++ b/React/Views/RCTFont.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAssert.h"
@@ -103,6 +101,10 @@ void RCTSetDefaultFontHandler(RCTFontHandler handler) {
   defaultFontHandler = handler;
 }
 
+BOOL RCTHasFontHandlerSet() {
+  return defaultFontHandler != nil;
+}
+
 // We pass a string description of the font weight to the defaultFontHandler because UIFontWeight
 // is not defined pre-iOS 8.2.
 // Furthermore, UIFontWeight's are lossy floats, so we must use an inexact compare to figure out
diff --git a/React/Views/RCTLayout.h b/React/Views/RCTLayout.h
new file mode 100644
index 00000000000000..4c000136d8990c
--- /dev/null
+++ b/React/Views/RCTLayout.h
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTDefines.h>
+#import <yoga/Yoga.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class RCTShadowView;
+
+typedef NS_ENUM(NSInteger, RCTDisplayType) {
+  RCTDisplayTypeNone,
+  RCTDisplayTypeFlex,
+  RCTDisplayTypeInline,
+};
+
+struct RCTLayoutMetrics {
+  CGRect frame;
+  CGRect contentFrame;
+  UIEdgeInsets borderWidth;
+  RCTDisplayType displayType;
+  UIUserInterfaceLayoutDirection layoutDirection;
+};
+typedef struct CG_BOXABLE RCTLayoutMetrics RCTLayoutMetrics;
+
+struct RCTLayoutContext {
+  CGPoint absolutePosition;
+  __unsafe_unretained NSHashTable<RCTShadowView *> *_Nonnull affectedShadowViews;
+  __unsafe_unretained NSHashTable<NSString *> *_Nonnull other;
+};
+typedef struct CG_BOXABLE RCTLayoutContext RCTLayoutContext;
+
+static inline BOOL RCTLayoutMetricsEqualToLayoutMetrics(RCTLayoutMetrics a, RCTLayoutMetrics b)
+{
+  return
+    CGRectEqualToRect(a.frame, b.frame) &&
+    CGRectEqualToRect(a.contentFrame, b.contentFrame) &&
+    UIEdgeInsetsEqualToEdgeInsets(a.borderWidth, b.borderWidth) &&
+    a.displayType == b.displayType &&
+    a.layoutDirection == b.layoutDirection;
+}
+
+RCT_EXTERN RCTLayoutMetrics RCTLayoutMetricsFromYogaNode(YGNodeRef yogaNode);
+
+/**
+ * Converts float values between Yoga and CoreGraphics representations,
+ * especially in terms of edge cases.
+ */
+RCT_EXTERN float RCTYogaFloatFromCoreGraphicsFloat(CGFloat value);
+RCT_EXTERN CGFloat RCTCoreGraphicsFloatFromYogaFloat(float value);
+
+/**
+ * Converts compound `YGValue` to simple `CGFloat` value.
+ */
+RCT_EXTERN CGFloat RCTCoreGraphicsFloatFromYogaValue(YGValue value, CGFloat baseFloatValue);
+
+/**
+ * Converts `YGDirection` to `UIUserInterfaceLayoutDirection` and vise versa.
+ */
+RCT_EXTERN YGDirection RCTYogaLayoutDirectionFromUIKitLayoutDirection(UIUserInterfaceLayoutDirection direction);
+RCT_EXTERN UIUserInterfaceLayoutDirection RCTUIKitLayoutDirectionFromYogaLayoutDirection(YGDirection direction);
+
+/**
+ * Converts `YGDisplay` to `RCTDisplayType` and vise versa.
+ */
+RCT_EXTERN YGDisplay RCTYogaDisplayTypeFromReactDisplayType(RCTDisplayType displayType);
+RCT_EXTERN RCTDisplayType RCTReactDisplayTypeFromYogaDisplayType(YGDisplay displayType);
+
+NS_ASSUME_NONNULL_END
diff --git a/React/Views/RCTLayout.m b/React/Views/RCTLayout.m
new file mode 100644
index 00000000000000..8b0f6a2b6e75af
--- /dev/null
+++ b/React/Views/RCTLayout.m
@@ -0,0 +1,143 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <yoga/Yoga.h>
+
+#import "RCTAssert.h"
+#import "RCTShadowView+Layout.h"
+
+RCTLayoutMetrics RCTLayoutMetricsFromYogaNode(YGNodeRef yogaNode)
+{
+  RCTLayoutMetrics layoutMetrics;
+
+  CGRect frame = (CGRect){
+    (CGPoint){
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetLeft(yogaNode)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetTop(yogaNode))
+    },
+    (CGSize){
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetWidth(yogaNode)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetHeight(yogaNode))
+    }
+  };
+
+  UIEdgeInsets padding = (UIEdgeInsets){
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeTop)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeLeft)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeBottom)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeRight))
+  };
+
+  UIEdgeInsets borderWidth = (UIEdgeInsets){
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeTop)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeLeft)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeBottom)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeRight))
+  };
+
+  UIEdgeInsets compoundInsets = (UIEdgeInsets){
+    borderWidth.top + padding.top,
+    borderWidth.left + padding.left,
+    borderWidth.bottom + padding.bottom,
+    borderWidth.right + padding.right
+  };
+
+  CGRect bounds = (CGRect){CGPointZero, frame.size};
+  CGRect contentFrame = UIEdgeInsetsInsetRect(bounds, compoundInsets);
+
+  layoutMetrics.frame = frame;
+  layoutMetrics.borderWidth = borderWidth;
+  layoutMetrics.contentFrame = contentFrame;
+  layoutMetrics.displayType = RCTReactDisplayTypeFromYogaDisplayType(YGNodeStyleGetDisplay(yogaNode));
+  layoutMetrics.layoutDirection = RCTUIKitLayoutDirectionFromYogaLayoutDirection(YGNodeLayoutGetDirection(yogaNode));
+
+  return layoutMetrics;
+}
+
+
+/**
+ * Yoga and CoreGraphics have different opinions about how "infinity" value
+ * should be represented.
+ * Yoga uses `NAN` which requires additional effort to compare all those values,
+ * whereas GoreGraphics uses `GFLOAT_MAX` which can be easyly compared with
+ * standard `==` operator.
+ */
+
+float RCTYogaFloatFromCoreGraphicsFloat(CGFloat value)
+{
+  if (value == CGFLOAT_MAX || isnan(value) || isinf(value)) {
+    return YGUndefined;
+  }
+
+  return value;
+}
+
+CGFloat RCTCoreGraphicsFloatFromYogaFloat(float value)
+{
+  if (value == YGUndefined || isnan(value) || isinf(value)) {
+    return CGFLOAT_MAX;
+  }
+
+  return value;
+}
+
+CGFloat RCTCoreGraphicsFloatFromYogaValue(YGValue value, CGFloat baseFloatValue)
+{
+  switch (value.unit) {
+    case YGUnitPoint:
+      return RCTCoreGraphicsFloatFromYogaFloat(value.value);
+    case YGUnitPercent:
+      return RCTCoreGraphicsFloatFromYogaFloat(value.value) * baseFloatValue;
+    case YGUnitAuto:
+    case YGUnitUndefined:
+      return baseFloatValue;
+  }
+}
+
+YGDirection RCTYogaLayoutDirectionFromUIKitLayoutDirection(UIUserInterfaceLayoutDirection direction)
+{
+  switch (direction) {
+    case UIUserInterfaceLayoutDirectionRightToLeft:
+      return YGDirectionRTL;
+    case UIUserInterfaceLayoutDirectionLeftToRight:
+      return YGDirectionLTR;
+  }
+}
+
+UIUserInterfaceLayoutDirection RCTUIKitLayoutDirectionFromYogaLayoutDirection(YGDirection direction)
+{
+  switch (direction) {
+    case YGDirectionInherit:
+    case YGDirectionLTR:
+      return UIUserInterfaceLayoutDirectionLeftToRight;
+    case YGDirectionRTL:
+      return UIUserInterfaceLayoutDirectionRightToLeft;
+  }
+}
+
+YGDisplay RCTYogaDisplayTypeFromReactDisplayType(RCTDisplayType displayType)
+{
+  switch (displayType) {
+    case RCTDisplayTypeNone:
+      return YGDisplayNone;
+    case RCTDisplayTypeFlex:
+      return YGDisplayFlex;
+    case RCTDisplayTypeInline:
+      RCTAssert(NO, @"RCTDisplayTypeInline cannot be converted to YGDisplay value.");
+      return YGDisplayNone;
+  }
+}
+
+RCTDisplayType RCTReactDisplayTypeFromYogaDisplayType(YGDisplay displayType)
+{
+  switch (displayType) {
+    case YGDisplayFlex:
+      return RCTDisplayTypeFlex;
+    case YGDisplayNone:
+      return RCTDisplayTypeNone;
+  }
+}
diff --git a/React/Views/RCTMaskedView.h b/React/Views/RCTMaskedView.h
index 02b11a70ad0492..2406d6ce8ab541 100644
--- a/React/Views/RCTMaskedView.h
+++ b/React/Views/RCTMaskedView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTMaskedView.m b/React/Views/RCTMaskedView.m
index d3c43126c58e9e..5a1a4218127df7 100644
--- a/React/Views/RCTMaskedView.m
+++ b/React/Views/RCTMaskedView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMaskedView.h"
diff --git a/React/Views/RCTMaskedViewManager.h b/React/Views/RCTMaskedViewManager.h
index 9cf66573b5fda0..42e03124363886 100644
--- a/React/Views/RCTMaskedViewManager.h
+++ b/React/Views/RCTMaskedViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTMaskedViewManager.m b/React/Views/RCTMaskedViewManager.m
index 1c4e1f0fc3cbaf..d6bd575948ab29 100644
--- a/React/Views/RCTMaskedViewManager.m
+++ b/React/Views/RCTMaskedViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMaskedViewManager.h"
diff --git a/React/Views/RCTModalHostView.h b/React/Views/RCTModalHostView.h
index e638df3246bace..08506545acd983 100644
--- a/React/Views/RCTModalHostView.h
+++ b/React/Views/RCTModalHostView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTModalHostView.m b/React/Views/RCTModalHostView.m
index 6dbd6b658fc14b..102ccde8fd98b7 100644
--- a/React/Views/RCTModalHostView.m
+++ b/React/Views/RCTModalHostView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModalHostView.h"
diff --git a/React/Views/RCTModalHostViewController.h b/React/Views/RCTModalHostViewController.h
index ebcb0dcd428216..f7b27351214721 100644
--- a/React/Views/RCTModalHostViewController.h
+++ b/React/Views/RCTModalHostViewController.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTModalHostViewController.m b/React/Views/RCTModalHostViewController.m
index 8b57356c3a77c4..4b5c5281dce7ee 100644
--- a/React/Views/RCTModalHostViewController.m
+++ b/React/Views/RCTModalHostViewController.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModalHostViewController.h"
diff --git a/React/Views/RCTModalHostViewManager.h b/React/Views/RCTModalHostViewManager.h
index edf6daba7748b0..b325a9c6604d38 100644
--- a/React/Views/RCTModalHostViewManager.h
+++ b/React/Views/RCTModalHostViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTInvalidating.h>
diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
index dbc1f6af8cd68e..bb235dc625b755 100644
--- a/React/Views/RCTModalHostViewManager.m
+++ b/React/Views/RCTModalHostViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModalHostViewManager.h"
diff --git a/React/Views/RCTModalManager.h b/React/Views/RCTModalManager.h
index 33c0784e9b7df4..62c1743d7fb2e5 100644
--- a/React/Views/RCTModalManager.h
+++ b/React/Views/RCTModalManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTModalManager.m b/React/Views/RCTModalManager.m
index 551b263668d360..0920ad66528e4a 100644
--- a/React/Views/RCTModalManager.m
+++ b/React/Views/RCTModalManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModalManager.h"
diff --git a/React/Views/RCTNavItem.h b/React/Views/RCTNavItem.h
index 735d7b0ecbd1f1..9cabdf2e600a6a 100644
--- a/React/Views/RCTNavItem.h
+++ b/React/Views/RCTNavItem.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTNavItem.m b/React/Views/RCTNavItem.m
index 1b47128d1a1fe7..58923e2450a917 100644
--- a/React/Views/RCTNavItem.m
+++ b/React/Views/RCTNavItem.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNavItem.h"
diff --git a/React/Views/RCTNavItemManager.h b/React/Views/RCTNavItemManager.h
index b5b9fa58c928f1..8fcb61c3690457 100644
--- a/React/Views/RCTNavItemManager.h
+++ b/React/Views/RCTNavItemManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/React/Views/RCTNavItemManager.m b/React/Views/RCTNavItemManager.m
index b281938a2cf473..d9d349c5ad531c 100644
--- a/React/Views/RCTNavItemManager.m
+++ b/React/Views/RCTNavItemManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNavItemManager.h"
diff --git a/React/Views/RCTNavigator.h b/React/Views/RCTNavigator.h
index 88ee698208d949..b8ad30141c872d 100644
--- a/React/Views/RCTNavigator.h
+++ b/React/Views/RCTNavigator.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTNavigator.m b/React/Views/RCTNavigator.m
index dbe48f796b5905..0a0bfe61cf15e2 100644
--- a/React/Views/RCTNavigator.m
+++ b/React/Views/RCTNavigator.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNavigator.h"
diff --git a/React/Views/RCTNavigatorManager.h b/React/Views/RCTNavigatorManager.h
index e8be0494311af3..58c40c94e7f1f7 100644
--- a/React/Views/RCTNavigatorManager.h
+++ b/React/Views/RCTNavigatorManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTNavigatorManager.m b/React/Views/RCTNavigatorManager.m
index dee4187491046c..99a03cbb364439 100644
--- a/React/Views/RCTNavigatorManager.m
+++ b/React/Views/RCTNavigatorManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNavigatorManager.h"
diff --git a/React/Views/RCTPicker.h b/React/Views/RCTPicker.h
index d4931dec607d0e..3424f58f32d5b7 100644
--- a/React/Views/RCTPicker.h
+++ b/React/Views/RCTPicker.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTPicker.m b/React/Views/RCTPicker.m
index b9ac79387bd42b..3193417bdfdd8c 100644
--- a/React/Views/RCTPicker.m
+++ b/React/Views/RCTPicker.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPicker.h"
diff --git a/React/Views/RCTPickerManager.h b/React/Views/RCTPickerManager.h
index d2feb7caaefdb4..a24de5c6eb56df 100644
--- a/React/Views/RCTPickerManager.h
+++ b/React/Views/RCTPickerManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTPickerManager.m b/React/Views/RCTPickerManager.m
index 3e6a6e6dd614df..32947d0001c42d 100644
--- a/React/Views/RCTPickerManager.m
+++ b/React/Views/RCTPickerManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPickerManager.h"
diff --git a/React/Views/RCTPointerEvents.h b/React/Views/RCTPointerEvents.h
index 1eff59b5c4822d..b8a34fcf79e0c8 100644
--- a/React/Views/RCTPointerEvents.h
+++ b/React/Views/RCTPointerEvents.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTProgressViewManager.h b/React/Views/RCTProgressViewManager.h
index bf183f6372f0eb..6528d8ea861ca8 100644
--- a/React/Views/RCTProgressViewManager.h
+++ b/React/Views/RCTProgressViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTProgressViewManager.m b/React/Views/RCTProgressViewManager.m
index 65fe2df3c88689..d9381c100a57ce 100644
--- a/React/Views/RCTProgressViewManager.m
+++ b/React/Views/RCTProgressViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTProgressViewManager.h"
diff --git a/React/Views/RCTRefreshControl.h b/React/Views/RCTRefreshControl.h
index cc7a8c91eaa3f7..fa0a1b49473c4d 100644
--- a/React/Views/RCTRefreshControl.h
+++ b/React/Views/RCTRefreshControl.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTRefreshControl.m b/React/Views/RCTRefreshControl.m
index 3b447de55a5227..6bce70938592e7 100644
--- a/React/Views/RCTRefreshControl.m
+++ b/React/Views/RCTRefreshControl.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRefreshControl.h"
diff --git a/React/Views/RCTRefreshControlManager.h b/React/Views/RCTRefreshControlManager.h
index 00d117ed9ff4f3..ca9fec0739bc69 100644
--- a/React/Views/RCTRefreshControlManager.h
+++ b/React/Views/RCTRefreshControlManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTRefreshControlManager.m b/React/Views/RCTRefreshControlManager.m
index cd5e1759149c42..355d35073ae37d 100644
--- a/React/Views/RCTRefreshControlManager.m
+++ b/React/Views/RCTRefreshControlManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRefreshControlManager.h"
diff --git a/React/Views/RCTRootShadowView.h b/React/Views/RCTRootShadowView.h
index 95b96edf11f82b..38a65d0fb87a90 100644
--- a/React/Views/RCTRootShadowView.h
+++ b/React/Views/RCTRootShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
@@ -25,10 +23,6 @@
  */
 @property (nonatomic, assign) YGDirection baseDirection;
 
-/**
- * Calculate all views whose frame needs updating after layout has been calculated.
- * Returns a set contains the shadowviews that need updating.
- */
-- (NSSet<RCTShadowView *> *)collectViewsWithUpdatedFrames;
+- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews;
 
 @end
diff --git a/React/Views/RCTRootShadowView.m b/React/Views/RCTRootShadowView.m
index 15b5b6f7cb52fa..a1353a4ed0a00f 100644
--- a/React/Views/RCTRootShadowView.m
+++ b/React/Views/RCTRootShadowView.m
@@ -1,39 +1,40 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRootShadowView.h"
 
 #import "RCTI18nUtil.h"
+#import "RCTShadowView+Layout.h"
 
 @implementation RCTRootShadowView
 
 - (instancetype)init
 {
-  self = [super init];
-  if (self) {
+  if (self = [super init]) {
     _baseDirection = [[RCTI18nUtil sharedInstance] isRTL] ? YGDirectionRTL : YGDirectionLTR;
     _availableSize = CGSizeMake(INFINITY, INFINITY);
   }
+
   return self;
 }
 
-- (NSSet<RCTShadowView *> *)collectViewsWithUpdatedFrames
+- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews
 {
-  // Treating `INFINITY` as `YGUndefined` (which equals `NAN`).
-  float availableWidth = _availableSize.width == INFINITY ? YGUndefined : _availableSize.width;
-  float availableHeight = _availableSize.height == INFINITY ? YGUndefined : _availableSize.height;
+  NSHashTable<NSString *> *other = [NSHashTable new];
 
-  YGNodeCalculateLayout(self.yogaNode, availableWidth, availableHeight, _baseDirection);
+  RCTLayoutContext layoutContext = {};
+  layoutContext.absolutePosition = CGPointZero;
+  layoutContext.affectedShadowViews = affectedShadowViews;
+  layoutContext.other = other;
 
-  NSMutableSet<RCTShadowView *> *viewsWithNewFrame = [NSMutableSet set];
-  [self applyLayoutNode:self.yogaNode viewsWithNewFrame:viewsWithNewFrame absolutePosition:CGPointZero];
-  return viewsWithNewFrame;
+  [self layoutWithMinimumSize:CGSizeZero
+                  maximumSize:_availableSize
+              layoutDirection:RCTUIKitLayoutDirectionFromYogaLayoutDirection(_baseDirection)
+                layoutContext:layoutContext];
 }
 
 @end
diff --git a/React/Views/RCTSegmentedControl.h b/React/Views/RCTSegmentedControl.h
index 4809816879b6d0..d29774a2b26376 100644
--- a/React/Views/RCTSegmentedControl.h
+++ b/React/Views/RCTSegmentedControl.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTSegmentedControl.m b/React/Views/RCTSegmentedControl.m
index 4d10a3d205fed6..4b3650c9c8bf47 100644
--- a/React/Views/RCTSegmentedControl.m
+++ b/React/Views/RCTSegmentedControl.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSegmentedControl.h"
diff --git a/React/Views/RCTSegmentedControlManager.h b/React/Views/RCTSegmentedControlManager.h
index 4b6c8f8e05e9ba..ad642a6dbf011f 100644
--- a/React/Views/RCTSegmentedControlManager.h
+++ b/React/Views/RCTSegmentedControlManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTSegmentedControlManager.m b/React/Views/RCTSegmentedControlManager.m
index 9d1002e546995f..8805917deaa327 100644
--- a/React/Views/RCTSegmentedControlManager.m
+++ b/React/Views/RCTSegmentedControlManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSegmentedControlManager.h"
diff --git a/React/Views/RCTShadowView+Internal.h b/React/Views/RCTShadowView+Internal.h
index cf2d3bf5a2fb89..a5518410a7fc8a 100644
--- a/React/Views/RCTShadowView+Internal.h
+++ b/React/Views/RCTShadowView+Internal.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTShadowView+Internal.m b/React/Views/RCTShadowView+Internal.m
index 09b74ca2e2505d..2a10f2d623e3f2 100644
--- a/React/Views/RCTShadowView+Internal.m
+++ b/React/Views/RCTShadowView+Internal.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTShadowView+Layout.h"
diff --git a/React/Views/RCTShadowView+Layout.h b/React/Views/RCTShadowView+Layout.h
index 8e4966663c1d40..c7d0f16c5f772a 100644
--- a/React/Views/RCTShadowView+Layout.h
+++ b/React/Views/RCTShadowView+Layout.h
@@ -1,23 +1,14 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
 
 #import <React/RCTShadowView.h>
 
-/**
- * Converts float values between Yoga and CoreGraphics representations,
- * especially in terms of edge cases.
- */
-RCT_EXTERN float RCTYogaFloatFromCoreGraphicsFloat(CGFloat value);
-RCT_EXTERN CGFloat RCTCoreGraphicsFloatFromYogaFloat(float value);
-
 @interface RCTShadowView (Layout)
 
 #pragma mark - Computed Layout-Inferred Metrics
@@ -28,13 +19,6 @@ RCT_EXTERN CGFloat RCTCoreGraphicsFloatFromYogaFloat(float value);
 @property (nonatomic, readonly) CGSize availableSize;
 @property (nonatomic, readonly) CGRect contentFrame;
 
-#pragma mark - Measuring
-
-/**
- * Measures shadow view without side-effects.
- */
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize;
-
 #pragma mark - Dirty Propagation Control
 
 /**
diff --git a/React/Views/RCTShadowView+Layout.m b/React/Views/RCTShadowView+Layout.m
index 9726ead4163fb7..af2987c1fa1ee1 100644
--- a/React/Views/RCTShadowView+Layout.m
+++ b/React/Views/RCTShadowView+Layout.m
@@ -1,41 +1,15 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTShadowView+Layout.h"
 
 #import <yoga/Yoga.h>
 
-/**
- * Yoga and CoreGraphics have different opinions about how "infinity" value
- * should be represented.
- * Yoga uses `NAN` which requires additional effort to compare all those values,
- * whereas GoreGraphics uses `GFLOAT_MAX` which can be easyly compared with
- * standard `==` operator.
- */
-
-float RCTYogaFloatFromCoreGraphicsFloat(CGFloat value)
-{
-  if (value == CGFLOAT_MAX || isnan(value) || isinf(value)) {
-    return YGUndefined;
-  }
-
-  return value;
-}
-
-CGFloat RCTCoreGraphicsFloatFromYogaFloat(float value)
-{
-  if (value == YGUndefined || isnan(value) || isinf(value)) {
-    return CGFLOAT_MAX;
-  }
-
-  return value;
-}
+#import "RCTAssert.h"
 
 @implementation RCTShadowView (Layout)
 
@@ -78,46 +52,12 @@ - (UIEdgeInsets)compoundInsets
 
 - (CGSize)availableSize
 {
-  return UIEdgeInsetsInsetRect((CGRect){CGPointZero, self.frame.size}, self.compoundInsets).size;
+  return self.layoutMetrics.contentFrame.size;
 }
 
 - (CGRect)contentFrame
 {
-  CGRect bounds = (CGRect){CGPointZero, self.frame.size};
-  return UIEdgeInsetsInsetRect(bounds, self.compoundInsets);
-}
-
-#pragma mark - Measuring
-
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
-{
-  YGNodeRef clonnedYogaNode = YGNodeClone(self.yogaNode);
-  YGNodeRef constraintYogaNode = YGNodeNewWithConfig([[self class] yogaConfig]);
-
-  YGNodeInsertChild(constraintYogaNode, clonnedYogaNode, 0);
-
-  YGNodeStyleSetMinWidth(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.width));
-  YGNodeStyleSetMinHeight(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.height));
-  YGNodeStyleSetMaxWidth(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximumSize.width));
-  YGNodeStyleSetMaxHeight(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximumSize.height));
-
-  YGNodeCalculateLayout(
-    constraintYogaNode,
-    YGUndefined,
-    YGUndefined,
-    self.layoutDirection
-  );
-
-  CGSize measuredSize = (CGSize){
-    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetWidth(constraintYogaNode)),
-    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetHeight(constraintYogaNode)),
-  };
-
-  YGNodeRemoveChild(constraintYogaNode, clonnedYogaNode);
-  YGNodeFree(constraintYogaNode);
-  YGNodeFree(clonnedYogaNode);
-
-  return measuredSize;
+  return self.layoutMetrics.contentFrame;
 }
 
 #pragma mark - Dirty Propagation Control
diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
index 70d73aad6a63b2..ccf0d80cf28d32 100644
--- a/React/Views/RCTShadowView.h
+++ b/React/Views/RCTShadowView.h
@@ -1,15 +1,14 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
 
 #import <React/RCTComponent.h>
+#import <React/RCTLayout.h>
 #import <React/RCTRootView.h>
 #import <yoga/Yoga.h>
 
@@ -51,6 +50,11 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
 @property (nonatomic, copy) NSString *viewName;
 @property (nonatomic, copy) RCTDirectEventBlock onLayout;
 
+/**
+ * Computed layout of the view.
+ */
+@property (nonatomic, assign) RCTLayoutMetrics layoutMetrics;
+
 /**
  * In some cases we need a way to specify some environmental data to shadow view
  * to improve layout (or do something similar), so `localData` serves these needs.
@@ -70,12 +74,6 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
  */
 @property (nonatomic, assign, getter=isNewView) BOOL newView;
 
-/**
- * Computed layout direction of the view.
- */
-
-@property (nonatomic, assign, readonly) UIUserInterfaceLayoutDirection layoutDirection;
-
 /**
  * Position and dimensions.
  * Defaults to { 0, 0, NAN, NAN }.
@@ -167,38 +165,39 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
  */
 @property (nonatomic, assign) YGOverflow overflow;
 
-/**
- * Computed position of the view.
- */
-@property (nonatomic, assign, readonly) CGRect frame;
-
 /**
  * Represents the natural size of the view, which is used when explicit size is not set or is ambiguous.
  * Defaults to `{UIViewNoIntrinsicMetric, UIViewNoIntrinsicMetric}`.
  */
 @property (nonatomic, assign) CGSize intrinsicContentSize;
 
+#pragma mark - Layout
+
+/**
+ * Initiates layout starts from the view.
+ */
+- (void)layoutWithMinimumSize:(CGSize)minimumSize
+                  maximumSize:(CGSize)maximumSize
+              layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
+                layoutContext:(RCTLayoutContext)layoutContext;
+
 /**
- * Apply the CSS layout.
- * This method also calls `applyLayoutToChildren:` internally. The functionality
- * is split into two methods so subclasses can override `applyLayoutToChildren:`
- * while using default implementation of `applyLayoutNode:`.
+ * Applies computed layout metrics to the view.
  */
-- (void)applyLayoutNode:(YGNodeRef)node
-      viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-       absolutePosition:(CGPoint)absolutePosition NS_REQUIRES_SUPER;
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
+            layoutContext:(RCTLayoutContext)layoutContext;
 
-- (void)applyLayoutWithFrame:(CGRect)frame
-             layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
-      viewsWithUpdatedLayout:(NSMutableSet<RCTShadowView *> *)viewsWithUpdatedLayout
-            absolutePosition:(CGPoint)absolutePosition;
+/**
+ * Calculates (if needed) and applies layout to subviews.
+ */
+- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext;
 
 /**
- * Enumerate the child nodes and tell them to apply layout.
+ * Measures shadow view without side-effects.
+ * Default implementation uses Yoga for measuring.
  */
-- (void)applyLayoutToChildren:(YGNodeRef)node
-            viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-             absolutePosition:(CGPoint)absolutePosition;
+- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize
+                      maximumSize:(CGSize)maximumSize;
 
 /**
  * Returns whether or not this view can have any subviews.
diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m
index 28298edff88439..f29dbcbbd3631e 100644
--- a/React/Views/RCTShadowView.m
+++ b/React/Views/RCTShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTShadowView.h"
@@ -12,6 +10,7 @@
 #import "RCTConvert.h"
 #import "RCTI18nUtil.h"
 #import "RCTLog.h"
+#import "RCTShadowView+Layout.h"
 #import "RCTUtils.h"
 #import "UIView+Private.h"
 #import "UIView+React.h"
@@ -153,82 +152,21 @@ static void RCTProcessMetaPropsBorder(const YGValue metaProps[META_PROP_COUNT],
   YGNodeStyleSetBorder(node, YGEdgeAll, metaProps[META_PROP_ALL].value);
 }
 
-- (void)applyLayoutNode:(YGNodeRef)node
-      viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-       absolutePosition:(CGPoint)absolutePosition
-{
-  if (!YGNodeGetHasNewLayout(node)) {
-    return;
-  }
-
-  RCTAssert(!YGNodeIsDirty(node), @"Attempt to get layout metrics from dirtied Yoga node.");
-
-  YGNodeSetHasNewLayout(node, false);
-
-  if (YGNodeStyleGetDisplay(node) == YGDisplayNone) {
-    // If the node is hidden (has `display: none;`), its (and its descendants)
-    // layout metrics are invalid and/or dirtied, so we have to stop here.
-    return;
-  }
-
-  CGRect frame = CGRectMake(YGNodeLayoutGetLeft(node), YGNodeLayoutGetTop(node), YGNodeLayoutGetWidth(node), YGNodeLayoutGetHeight(node));
-
-  // Even if `YGNodeLayoutGetDirection` can return `YGDirectionInherit` here, it actually means
-  // that Yoga will use LTR layout for the view (even if layout process is not finished yet).
-  UIUserInterfaceLayoutDirection layoutDirection = YGNodeLayoutGetDirection(_yogaNode) == YGDirectionRTL ? UIUserInterfaceLayoutDirectionRightToLeft : UIUserInterfaceLayoutDirectionLeftToRight;
-
-  [self applyLayoutWithFrame:frame
-             layoutDirection:layoutDirection
-      viewsWithUpdatedLayout:viewsWithNewFrame
-            absolutePosition:absolutePosition];
-}
-
-- (void)applyLayoutWithFrame:(CGRect)frame
-             layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
-      viewsWithUpdatedLayout:(NSMutableSet<RCTShadowView *> *)viewsWithUpdatedLayout
-            absolutePosition:(CGPoint)absolutePosition
-{
-  if (!CGRectEqualToRect(_frame, frame) || _layoutDirection != layoutDirection) {
-    _frame = frame;
-    _layoutDirection = layoutDirection;
-    [viewsWithUpdatedLayout addObject:self];
-  }
-
-  absolutePosition.x += frame.origin.x;
-  absolutePosition.y += frame.origin.y;
-
-  [self applyLayoutToChildren:_yogaNode
-            viewsWithNewFrame:viewsWithUpdatedLayout
-             absolutePosition:absolutePosition];
-}
-
-- (void)applyLayoutToChildren:(YGNodeRef)node
-            viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-             absolutePosition:(CGPoint)absolutePosition
-{
-  for (unsigned int i = 0; i < YGNodeGetChildCount(node); ++i) {
-    RCTShadowView *child = (RCTShadowView *)_reactSubviews[i];
-    [child applyLayoutNode:YGNodeGetChild(node, i)
-         viewsWithNewFrame:viewsWithNewFrame
-          absolutePosition:absolutePosition];
-  }
-}
-
 - (CGRect)measureLayoutRelativeToAncestor:(RCTShadowView *)ancestor
 {
   CGPoint offset = CGPointZero;
   NSInteger depth = 30; // max depth to search
   RCTShadowView *shadowView = self;
   while (depth && shadowView && shadowView != ancestor) {
-    offset.x += shadowView.frame.origin.x;
-    offset.y += shadowView.frame.origin.y;
+    offset.x += shadowView.layoutMetrics.frame.origin.x;
+    offset.y += shadowView.layoutMetrics.frame.origin.y;
     shadowView = shadowView->_superview;
     depth--;
   }
   if (ancestor != shadowView) {
     return CGRectNull;
   }
-  return (CGRect){offset, self.frame.size};
+  return (CGRect){offset, self.layoutMetrics.frame.size};
 }
 
 - (BOOL)viewIsDescendantOf:(RCTShadowView *)ancestor
@@ -244,9 +182,7 @@ - (BOOL)viewIsDescendantOf:(RCTShadowView *)ancestor
 
 - (instancetype)init
 {
-  if ((self = [super init])) {
-    _frame = CGRectMake(0, 0, YGUndefined, YGUndefined);
-
+  if (self = [super init]) {
     for (unsigned int ii = 0; ii < META_PROP_COUNT; ii++) {
       _paddingMetaProps[ii] = YGValueUndefined;
       _marginMetaProps[ii] = YGValueUndefined;
@@ -316,12 +252,125 @@ - (RCTShadowView *)reactSuperview
   return _superview;
 }
 
+#pragma mark - Layout
+
+- (void)layoutWithMinimumSize:(CGSize)minimumSize
+                  maximumSize:(CGSize)maximumSize
+              layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
+                layoutContext:(RCTLayoutContext)layoutContext
+{
+  YGNodeRef yogaNode = _yogaNode;
+
+  CGSize oldMinimumSize = (CGSize){
+    RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinWidth(yogaNode), 0.0),
+    RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinHeight(yogaNode), 0.0)
+  };
+
+  if (!CGSizeEqualToSize(oldMinimumSize, minimumSize)) {
+    YGNodeStyleSetMinWidth(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.width));
+    YGNodeStyleSetMinHeight(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.height));
+  }
+
+  YGNodeCalculateLayout(
+    yogaNode,
+    RCTYogaFloatFromCoreGraphicsFloat(maximumSize.width),
+    RCTYogaFloatFromCoreGraphicsFloat(maximumSize.height),
+    RCTYogaLayoutDirectionFromUIKitLayoutDirection(layoutDirection)
+  );
+
+  RCTAssert(!YGNodeIsDirty(yogaNode), @"Attempt to get layout metrics from dirtied Yoga node.");
+
+  if (!YGNodeGetHasNewLayout(yogaNode)) {
+    return;
+  }
+
+  RCTLayoutMetrics layoutMetrics = RCTLayoutMetricsFromYogaNode(yogaNode);
+
+  layoutContext.absolutePosition.x += layoutMetrics.frame.origin.x;
+  layoutContext.absolutePosition.y += layoutMetrics.frame.origin.y;
+
+  [self layoutWithMetrics:layoutMetrics
+            layoutContext:layoutContext];
+
+  [self layoutSubviewsWithContext:layoutContext];
+}
+
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
+            layoutContext:(RCTLayoutContext)layoutContext
+{
+  if (!RCTLayoutMetricsEqualToLayoutMetrics(self.layoutMetrics, layoutMetrics)) {
+    self.layoutMetrics = layoutMetrics;
+    [layoutContext.affectedShadowViews addObject:self];
+  }
+}
+
+- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
+{
+  RCTLayoutMetrics layoutMetrics = self.layoutMetrics;
+
+  if (layoutMetrics.displayType == RCTDisplayTypeNone) {
+    return;
+  }
+
+  for (RCTShadowView *childShadowView in _reactSubviews) {
+    YGNodeRef childYogaNode = childShadowView.yogaNode;
+
+    RCTAssert(!YGNodeIsDirty(childYogaNode), @"Attempt to get layout metrics from dirtied Yoga node.");
+
+    if (!YGNodeGetHasNewLayout(childYogaNode)) {
+      continue;
+    }
+
+    RCTLayoutMetrics childLayoutMetrics = RCTLayoutMetricsFromYogaNode(childYogaNode);
+
+    layoutContext.absolutePosition.x += childLayoutMetrics.frame.origin.x;
+    layoutContext.absolutePosition.y += childLayoutMetrics.frame.origin.y;
+
+    [childShadowView layoutWithMetrics:childLayoutMetrics
+                         layoutContext:layoutContext];
+
+    // Recursive call.
+    [childShadowView layoutSubviewsWithContext:layoutContext];
+  }
+}
+
+- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
+{
+  YGNodeRef clonnedYogaNode = YGNodeClone(self.yogaNode);
+  YGNodeRef constraintYogaNode = YGNodeNewWithConfig([[self class] yogaConfig]);
+
+  YGNodeInsertChild(constraintYogaNode, clonnedYogaNode, 0);
+
+  YGNodeStyleSetMinWidth(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.width));
+  YGNodeStyleSetMinHeight(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.height));
+  YGNodeStyleSetMaxWidth(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximumSize.width));
+  YGNodeStyleSetMaxHeight(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximumSize.height));
+
+  YGNodeCalculateLayout(
+    constraintYogaNode,
+    YGUndefined,
+    YGUndefined,
+    self.layoutMetrics.layoutDirection
+  );
+
+  CGSize measuredSize = (CGSize){
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetWidth(constraintYogaNode)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetHeight(constraintYogaNode)),
+  };
+
+  YGNodeRemoveChild(constraintYogaNode, clonnedYogaNode);
+  YGNodeFree(constraintYogaNode);
+  YGNodeFree(clonnedYogaNode);
+
+  return measuredSize;
+}
+
 - (NSNumber *)reactTagAtPoint:(CGPoint)point
 {
   for (RCTShadowView *shadowView in _reactSubviews) {
-    if (CGRectContainsPoint(shadowView.frame, point)) {
+    if (CGRectContainsPoint(shadowView.layoutMetrics.frame, point)) {
       CGPoint relativePoint = point;
-      CGPoint origin = shadowView.frame.origin;
+      CGPoint origin = shadowView.layoutMetrics.frame.origin;
       relativePoint.x -= origin.x;
       relativePoint.y -= origin.y;
       return [shadowView reactTagAtPoint:relativePoint];
@@ -333,7 +382,7 @@ - (NSNumber *)reactTagAtPoint:(CGPoint)point
 - (NSString *)description
 {
   NSString *description = super.description;
-  description = [[description substringToIndex:description.length - 1] stringByAppendingFormat:@"; viewName: %@; reactTag: %@; frame: %@>", self.viewName, self.reactTag, NSStringFromCGRect(self.frame)];
+  description = [[description substringToIndex:description.length - 1] stringByAppendingFormat:@"; viewName: %@; reactTag: %@; frame: %@>", self.viewName, self.reactTag, NSStringFromCGRect(self.layoutMetrics.frame)];
   return description;
 }
 
diff --git a/React/Views/RCTSlider.h b/React/Views/RCTSlider.h
index 35c07902ce88fd..139d5dfa6f92d8 100644
--- a/React/Views/RCTSlider.h
+++ b/React/Views/RCTSlider.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTSlider.m b/React/Views/RCTSlider.m
index 358d443fbb8b97..50407057a6d05c 100644
--- a/React/Views/RCTSlider.m
+++ b/React/Views/RCTSlider.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSlider.h"
diff --git a/React/Views/RCTSliderManager.h b/React/Views/RCTSliderManager.h
index a4696ec31b9b36..a500a16963d80d 100644
--- a/React/Views/RCTSliderManager.h
+++ b/React/Views/RCTSliderManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTSliderManager.m b/React/Views/RCTSliderManager.m
index 50638f2cb9c2c7..a8a5d24a9165f2 100644
--- a/React/Views/RCTSliderManager.m
+++ b/React/Views/RCTSliderManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSliderManager.h"
diff --git a/React/Views/RCTSwitch.h b/React/Views/RCTSwitch.h
index 09da30a544c40c..2bd430707b4070 100644
--- a/React/Views/RCTSwitch.h
+++ b/React/Views/RCTSwitch.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTSwitch.m b/React/Views/RCTSwitch.m
index 6c4e2856495931..23e07bfc641101 100644
--- a/React/Views/RCTSwitch.m
+++ b/React/Views/RCTSwitch.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSwitch.h"
diff --git a/React/Views/RCTSwitchManager.h b/React/Views/RCTSwitchManager.h
index 538d25c0030955..b37b1ee86a8e29 100644
--- a/React/Views/RCTSwitchManager.h
+++ b/React/Views/RCTSwitchManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTSwitchManager.m b/React/Views/RCTSwitchManager.m
index 7fe065baa82866..6642623e7919ee 100644
--- a/React/Views/RCTSwitchManager.m
+++ b/React/Views/RCTSwitchManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSwitchManager.h"
diff --git a/React/Views/RCTTVView.h b/React/Views/RCTTVView.h
index a7bb5137fbfeba..4f8b2f79c62b9f 100644
--- a/React/Views/RCTTVView.h
+++ b/React/Views/RCTTVView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTTVView.m b/React/Views/RCTTVView.m
index 204b6f390d9288..4351978629a807 100644
--- a/React/Views/RCTTVView.m
+++ b/React/Views/RCTTVView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTVView.h"
@@ -29,24 +27,50 @@ @implementation RCTTVView
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
-    self.tvParallaxProperties = @{
-      @"enabled": @YES,
-      @"shiftDistanceX": @2.0f,
-      @"shiftDistanceY": @2.0f,
-      @"tiltAngle": @0.05f,
-      @"magnification": @1.0f
-    };
+    dispatch_once(&onceToken, ^{
+      defaultTVParallaxProperties = @{
+        @"enabled": @YES,
+        @"shiftDistanceX": @2.0f,
+        @"shiftDistanceY": @2.0f,
+        @"tiltAngle": @0.05f,
+        @"magnification": @1.0f,
+        @"pressMagnification": @1.0f,
+        @"pressDuration": @0.3f,
+        @"pressDelay": @0.0f
+      };
+    });
+    self.tvParallaxProperties = defaultTVParallaxProperties;
   }
 
   return self;
 }
 
+static NSDictionary* defaultTVParallaxProperties = nil;
+static dispatch_once_t onceToken;
+
+- (void)setTvParallaxProperties:(NSDictionary *)tvParallaxProperties {
+  if (_tvParallaxProperties == nil) {
+    _tvParallaxProperties = [defaultTVParallaxProperties copy];
+    return;
+  }
+
+  NSMutableDictionary *newParallaxProperties = [NSMutableDictionary dictionaryWithDictionary:_tvParallaxProperties];
+  for (NSString *k in [defaultTVParallaxProperties allKeys]) {
+    if (tvParallaxProperties[k]) {
+      newParallaxProperties[k] = tvParallaxProperties[k];
+    }
+  }
+  _tvParallaxProperties = [newParallaxProperties copy];
+}
+
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:unused)
 
 - (void)setIsTVSelectable:(BOOL)isTVSelectable {
   self->_isTVSelectable = isTVSelectable;
-  if(isTVSelectable) {
-    UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSelect:)];
+  if (isTVSelectable) {
+    UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc] 
+                                           initWithTarget:self 
+                                                   action:@selector(handleSelect:)];
     recognizer.allowedPressTypes = @[@(UIPressTypeSelect)];
     _selectRecognizer = recognizer;
     [self addGestureRecognizer:_selectRecognizer];
@@ -59,8 +83,37 @@ - (void)setIsTVSelectable:(BOOL)isTVSelectable {
 
 - (void)handleSelect:(__unused UIGestureRecognizer *)r
 {
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification
-                                                      object:@{@"eventType":@"select",@"tag":self.reactTag}];
+	if ([self.tvParallaxProperties[@"enabled"] boolValue] == YES) {
+    float magnification = [self.tvParallaxProperties[@"magnification"] floatValue];
+    float pressMagnification = [self.tvParallaxProperties[@"pressMagnification"] floatValue];
+		
+		// Duration of press animation
+		float pressDuration = [self.tvParallaxProperties[@"pressDuration"] floatValue];
+		
+		// Delay of press animation
+		float pressDelay = [self.tvParallaxProperties[@"pressDelay"] floatValue];
+		
+    [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:pressDelay]];
+    
+    [UIView animateWithDuration:(pressDuration/2)
+      animations:^{
+        self.transform = CGAffineTransformMakeScale(pressMagnification, pressMagnification);
+      }
+      completion:^(__unused BOOL finished1){
+        [UIView animateWithDuration:(pressDuration/2)
+          animations:^{
+            self.transform = CGAffineTransformMakeScale(magnification, magnification);
+          }
+          completion:^(__unused BOOL finished2) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification 
+              object:@{@"eventType":@"select",@"tag":self.reactTag}];
+          }];
+       }];
+    
+	} else {
+		[[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification
+															                          object:@{@"eventType":@"select",@"tag":self.reactTag}];
+	}
 }
 
 - (BOOL)isUserInteractionEnabled
@@ -81,15 +134,15 @@ - (void)addParallaxMotionEffects
 
   // Make horizontal movements shift the centre left and right
   UIInterpolatingMotionEffect *xShift = [[UIInterpolatingMotionEffect alloc]
-                                         initWithKeyPath:@"center.x"
-                                         type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
+                                          initWithKeyPath:@"center.x"
+                                                     type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
   xShift.minimumRelativeValue = @( shiftDistanceX * -1.0f);
   xShift.maximumRelativeValue = @( shiftDistanceX);
 
   // Make vertical movements shift the centre up and down
   UIInterpolatingMotionEffect *yShift = [[UIInterpolatingMotionEffect alloc]
-                                         initWithKeyPath:@"center.y"
-                                         type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
+                                          initWithKeyPath:@"center.y"
+                                                     type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
   yShift.minimumRelativeValue = @( shiftDistanceY * -1.0f);
   yShift.maximumRelativeValue = @( shiftDistanceY);
 
@@ -97,7 +150,9 @@ - (void)addParallaxMotionEffects
   CGFloat const tiltAngle = [self.tvParallaxProperties[@"tiltAngle"] floatValue];
 
   // Now make horizontal movements effect a rotation about the Y axis for side-to-side rotation.
-  UIInterpolatingMotionEffect *xTilt = [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"layer.transform" type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
+  UIInterpolatingMotionEffect *xTilt = [[UIInterpolatingMotionEffect alloc] 
+                                         initWithKeyPath:@"layer.transform"
+                                                    type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
 
   // CATransform3D value for minimumRelativeValue
   CATransform3D transMinimumTiltAboutY = CATransform3DIdentity;
@@ -114,7 +169,9 @@ - (void)addParallaxMotionEffects
   xTilt.maximumRelativeValue = [NSValue valueWithCATransform3D: transMaximumTiltAboutY];
 
   // Now make vertical movements effect a rotation about the X axis for up and down rotation.
-  UIInterpolatingMotionEffect *yTilt = [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"layer.transform" type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
+  UIInterpolatingMotionEffect *yTilt = [[UIInterpolatingMotionEffect alloc] 
+                                         initWithKeyPath:@"layer.transform" 
+                                                    type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
 
   // CATransform3D value for minimumRelativeValue
   CATransform3D transMinimumTiltAboutX = CATransform3DIdentity;
diff --git a/React/Views/RCTTabBar.h b/React/Views/RCTTabBar.h
index d2f1c1e7a5de0e..249aa9baaba073 100644
--- a/React/Views/RCTTabBar.h
+++ b/React/Views/RCTTabBar.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTTabBar.m b/React/Views/RCTTabBar.m
index a5c59a47b22268..0d02bb5a8ad4d7 100644
--- a/React/Views/RCTTabBar.m
+++ b/React/Views/RCTTabBar.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTabBar.h"
diff --git a/React/Views/RCTTabBarItem.h b/React/Views/RCTTabBarItem.h
index 0f4350eae223af..25e36de62da252 100644
--- a/React/Views/RCTTabBarItem.h
+++ b/React/Views/RCTTabBarItem.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTTabBarItem.m b/React/Views/RCTTabBarItem.m
index b48cb4d152d953..57ffe57c931d4d 100644
--- a/React/Views/RCTTabBarItem.m
+++ b/React/Views/RCTTabBarItem.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTabBarItem.h"
diff --git a/React/Views/RCTTabBarItemManager.h b/React/Views/RCTTabBarItemManager.h
index 484ec23a32ee7a..fd72e35b123d0a 100644
--- a/React/Views/RCTTabBarItemManager.h
+++ b/React/Views/RCTTabBarItemManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTTabBarItemManager.m b/React/Views/RCTTabBarItemManager.m
index ca4684577587cf..b51952b4e073cb 100644
--- a/React/Views/RCTTabBarItemManager.m
+++ b/React/Views/RCTTabBarItemManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTabBarItemManager.h"
diff --git a/React/Views/RCTTabBarManager.h b/React/Views/RCTTabBarManager.h
index 99f59805312ce7..b41f52b89a2854 100644
--- a/React/Views/RCTTabBarManager.h
+++ b/React/Views/RCTTabBarManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTTabBarManager.m b/React/Views/RCTTabBarManager.m
index f8e98854d05590..6813ffb5d436c7 100644
--- a/React/Views/RCTTabBarManager.m
+++ b/React/Views/RCTTabBarManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTabBarManager.h"
diff --git a/React/Views/RCTTextDecorationLineType.h b/React/Views/RCTTextDecorationLineType.h
index 1167f50064e8fa..21152baea4fb49 100644
--- a/React/Views/RCTTextDecorationLineType.h
+++ b/React/Views/RCTTextDecorationLineType.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTView.h b/React/Views/RCTView.h
index 992dc65c647122..68cf22ef20ff1e 100644
--- a/React/Views/RCTView.h
+++ b/React/Views/RCTView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTView.m b/React/Views/RCTView.m
index 41d780c3086d8f..d8888cbdc681b5 100644
--- a/React/Views/RCTView.m
+++ b/React/Views/RCTView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTView.h"
diff --git a/React/Views/RCTViewManager.h b/React/Views/RCTViewManager.h
index 4495a24cc42f0d..2edadcc775e117 100644
--- a/React/Views/RCTViewManager.h
+++ b/React/Views/RCTViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
@@ -67,13 +65,13 @@ typedef void (^RCTViewManagerUIBlock)(RCTUIManager *uiManager, NSDictionary<NSNu
  * This handles the simple case, where JS and native property names match.
  */
 #define RCT_EXPORT_VIEW_PROPERTY(name, type) \
-+ (NSArray<NSString *> *)propConfig_##name { return @[@#type]; }
++ (NSArray<NSString *> *)propConfig_##name RCT_DYNAMIC { return @[@#type]; }
 
 /**
  * This macro maps a named property to an arbitrary key path in the view.
  */
 #define RCT_REMAP_VIEW_PROPERTY(name, keyPath, type) \
-+ (NSArray<NSString *> *)propConfig_##name { return @[@#type, @#keyPath]; }
++ (NSArray<NSString *> *)propConfig_##name RCT_DYNAMIC { return @[@#type, @#keyPath]; }
 
 /**
  * This macro can be used when you need to provide custom logic for setting
@@ -82,19 +80,19 @@ typedef void (^RCTViewManagerUIBlock)(RCTUIManager *uiManager, NSDictionary<NSNu
  */
 #define RCT_CUSTOM_VIEW_PROPERTY(name, type, viewClass) \
 RCT_REMAP_VIEW_PROPERTY(name, __custom__, type)         \
-- (void)set_##name:(id)json forView:(viewClass *)view withDefaultView:(viewClass *)defaultView
+- (void)set_##name:(id)json forView:(viewClass *)view withDefaultView:(viewClass *)defaultView RCT_DYNAMIC
 
 /**
  * This macro is used to map properties to the shadow view, instead of the view.
  */
 #define RCT_EXPORT_SHADOW_PROPERTY(name, type) \
-+ (NSArray<NSString *> *)propConfigShadow_##name { return @[@#type]; }
++ (NSArray<NSString *> *)propConfigShadow_##name RCT_DYNAMIC { return @[@#type]; }
 
 /**
  * This macro maps a named property to an arbitrary key path in the shadow view.
  */
 #define RCT_REMAP_SHADOW_PROPERTY(name, keyPath, type) \
-+ (NSArray<NSString *> *)propConfigShadow_##name { return @[@#type, @#keyPath]; }
++ (NSArray<NSString *> *)propConfigShadow_##name RCT_DYNAMIC { return @[@#type, @#keyPath]; }
 
 /**
  * This macro can be used when you need to provide custom logic for setting
@@ -103,6 +101,6 @@ RCT_REMAP_VIEW_PROPERTY(name, __custom__, type)         \
  */
 #define RCT_CUSTOM_SHADOW_PROPERTY(name, type, viewClass) \
 RCT_REMAP_SHADOW_PROPERTY(name, __custom__, type)         \
-- (void)set_##name:(id)json forShadowView:(viewClass *)view
+- (void)set_##name:(id)json forShadowView:(viewClass *)view RCT_DYNAMIC
 
 @end
diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
index 06035516fa2914..626e923d35e5db 100644
--- a/React/Views/RCTViewManager.m
+++ b/React/Views/RCTViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTViewManager.h"
diff --git a/React/Views/RCTWebView.h b/React/Views/RCTWebView.h
index 92e9c6bb7ea791..eccb5b94c6daa3 100644
--- a/React/Views/RCTWebView.h
+++ b/React/Views/RCTWebView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTView.h>
diff --git a/React/Views/RCTWebView.m b/React/Views/RCTWebView.m
index 596f87e9680330..61042b221f79ef 100644
--- a/React/Views/RCTWebView.m
+++ b/React/Views/RCTWebView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTWebView.h"
diff --git a/React/Views/RCTWebViewManager.h b/React/Views/RCTWebViewManager.h
index bb075c22ae8adc..2c83b2f64169fc 100644
--- a/React/Views/RCTWebViewManager.h
+++ b/React/Views/RCTWebViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTWebViewManager.m b/React/Views/RCTWebViewManager.m
index ec6192ef5672b1..8f4ef9b0f4f793 100644
--- a/React/Views/RCTWebViewManager.m
+++ b/React/Views/RCTWebViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTWebViewManager.h"
diff --git a/React/Views/RCTWrapperViewController.h b/React/Views/RCTWrapperViewController.h
index 7e27d904f2a0de..7baa0c08c533ed 100644
--- a/React/Views/RCTWrapperViewController.h
+++ b/React/Views/RCTWrapperViewController.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTWrapperViewController.m b/React/Views/RCTWrapperViewController.m
index 71a7d84acda3f8..30103019eef4f2 100644
--- a/React/Views/RCTWrapperViewController.m
+++ b/React/Views/RCTWrapperViewController.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTWrapperViewController.h"
diff --git a/React/Views/SafeAreaView/RCTSafeAreaShadowView.h b/React/Views/SafeAreaView/RCTSafeAreaShadowView.h
index 9987b22e5937e7..8ce55759f86ec3 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaShadowView.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
index 8b749bcce9132f..333c0da7fbe43f 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSafeAreaShadowView.h"
diff --git a/React/Views/SafeAreaView/RCTSafeAreaView.h b/React/Views/SafeAreaView/RCTSafeAreaView.h
index c2605f095ae0a5..1964b0b65f9f6f 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaView.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/SafeAreaView/RCTSafeAreaView.m b/React/Views/SafeAreaView/RCTSafeAreaView.m
index 971408ae25dfac..e4fe4b6d17146a 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaView.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSafeAreaView.h"
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h
index 8e2fdac7b1abe0..a644890c6abefc 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m
index 674c9ff3531b6e..0c38d89344755a 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSafeAreaViewLocalData.h"
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewManager.h b/React/Views/SafeAreaView/RCTSafeAreaViewManager.h
index 9c8f5f28b9c22e..aeaf69a73deba8 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewManager.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewManager.m b/React/Views/SafeAreaView/RCTSafeAreaViewManager.m
index bdbe7394cb52b6..6bc64562358ccc 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewManager.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSafeAreaViewManager.h"
diff --git a/React/Views/ScrollView/RCTScrollContentShadowView.h b/React/Views/ScrollView/RCTScrollContentShadowView.h
index 8b94dd2d61c0fb..e10573cca94ae1 100644
--- a/React/Views/ScrollView/RCTScrollContentShadowView.h
+++ b/React/Views/ScrollView/RCTScrollContentShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/ScrollView/RCTScrollContentShadowView.m b/React/Views/ScrollView/RCTScrollContentShadowView.m
index 700ab181322d40..3988ee381e7e66 100644
--- a/React/Views/ScrollView/RCTScrollContentShadowView.m
+++ b/React/Views/ScrollView/RCTScrollContentShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTScrollContentShadowView.h"
@@ -13,43 +11,22 @@
 
 #import "RCTUtils.h"
 
-@interface RCTShadowView () {
-  // This will be removed after t15757916, which will remove
-  // side-effects from `setFrame:` method.
-  @public CGRect _frame;
-}
-@end
-
 @implementation RCTScrollContentShadowView
 
-- (void)applyLayoutNode:(YGNodeRef)node
-      viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-       absolutePosition:(CGPoint)absolutePosition
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
+            layoutContext:(RCTLayoutContext)layoutContext
 {
-  // Call super method if LTR layout is enforced.
-  if (YGNodeLayoutGetDirection(self.yogaNode) != YGDirectionRTL) {
-    [super applyLayoutNode:node
-         viewsWithNewFrame:viewsWithNewFrame
-          absolutePosition:absolutePosition];
-    return;
+  if (layoutMetrics.layoutDirection == UIUserInterfaceLayoutDirectionRightToLeft) {
+    // Motivation:
+    // Yoga place `contentView` on the right side of `scrollView` when RTL layout is enfoced.
+    // That breaks everything; it is completely pointless to (re)position `contentView`
+    // because it is `contentView`'s job. So, we work around it here.
+
+    layoutContext.absolutePosition.x += layoutMetrics.frame.size.width;
+    layoutMetrics.frame.origin.x = 0;
   }
 
-  // Motivation:
-  // Yoga place `contentView` on the right side of `scrollView` when RTL layout is enfoced.
-  // That breaks everything; it is completely pointless to (re)position `contentView`
-  // because it is `contentView`'s job. So, we work around it here.
-
-  // Step 1. Compensate `absolutePosition` change.
-  CGFloat xCompensation = YGNodeLayoutGetRight(node) - YGNodeLayoutGetLeft(node);
-  absolutePosition.x += xCompensation;
-
-  // Step 2. Call super method.
-  [super applyLayoutNode:node
-       viewsWithNewFrame:viewsWithNewFrame
-        absolutePosition:absolutePosition];
-
-  // Step 3. Reset the position.
-  _frame.origin.x = RCTRoundPixelValue(YGNodeLayoutGetRight(node));
+  [super layoutWithMetrics:layoutMetrics layoutContext:layoutContext];
 }
 
 @end
diff --git a/React/Views/ScrollView/RCTScrollContentView.h b/React/Views/ScrollView/RCTScrollContentView.h
index f25250cc5f8269..5271bf250b1591 100644
--- a/React/Views/ScrollView/RCTScrollContentView.h
+++ b/React/Views/ScrollView/RCTScrollContentView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/ScrollView/RCTScrollContentView.m b/React/Views/ScrollView/RCTScrollContentView.m
index a7fb9d2180e18d..a6426dec89a954 100644
--- a/React/Views/ScrollView/RCTScrollContentView.m
+++ b/React/Views/ScrollView/RCTScrollContentView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTScrollContentView.h"
diff --git a/React/Views/ScrollView/RCTScrollContentViewManager.h b/React/Views/ScrollView/RCTScrollContentViewManager.h
index e1c90e31bff541..bf5c250a5fb0da 100644
--- a/React/Views/ScrollView/RCTScrollContentViewManager.h
+++ b/React/Views/ScrollView/RCTScrollContentViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/ScrollView/RCTScrollContentViewManager.m b/React/Views/ScrollView/RCTScrollContentViewManager.m
index 18585fb88d1f11..732f976556f610 100644
--- a/React/Views/ScrollView/RCTScrollContentViewManager.m
+++ b/React/Views/ScrollView/RCTScrollContentViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTScrollContentViewManager.h"
diff --git a/React/Views/ScrollView/RCTScrollView.h b/React/Views/ScrollView/RCTScrollView.h
index dda27dfce04551..e1853e5d9d3558 100644
--- a/React/Views/ScrollView/RCTScrollView.h
+++ b/React/Views/ScrollView/RCTScrollView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIScrollView.h>
diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
index ecdb9ddaa2ddc0..f146ba0d2369a0 100644
--- a/React/Views/ScrollView/RCTScrollView.m
+++ b/React/Views/ScrollView/RCTScrollView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTScrollView.h"
diff --git a/React/Views/ScrollView/RCTScrollViewManager.h b/React/Views/ScrollView/RCTScrollViewManager.h
index 5faeb5b99d4cf4..40c1a9ddb10b42 100644
--- a/React/Views/ScrollView/RCTScrollViewManager.h
+++ b/React/Views/ScrollView/RCTScrollViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/React/Views/ScrollView/RCTScrollViewManager.m b/React/Views/ScrollView/RCTScrollViewManager.m
index 3c7d11405a74dd..e5824afd3f386d 100644
--- a/React/Views/ScrollView/RCTScrollViewManager.m
+++ b/React/Views/ScrollView/RCTScrollViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTScrollViewManager.h"
diff --git a/React/Views/ScrollView/RCTScrollableProtocol.h b/React/Views/ScrollView/RCTScrollableProtocol.h
index a143d638602fa1..33ed067ec4acac 100644
--- a/React/Views/ScrollView/RCTScrollableProtocol.h
+++ b/React/Views/ScrollView/RCTScrollableProtocol.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/UIView+Private.h b/React/Views/UIView+Private.h
index 078f16e07219e0..7a8d6587ddcebd 100644
--- a/React/Views/UIView+Private.h
+++ b/React/Views/UIView+Private.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/UIView+React.h b/React/Views/UIView+React.h
index 1c90f16dbef806..94de7aae753130 100644
--- a/React/Views/UIView+React.h
+++ b/React/Views/UIView+React.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/UIView+React.m b/React/Views/UIView+React.m
index a764eb46a941aa..22d14f82c4a334 100644
--- a/React/Views/UIView+React.m
+++ b/React/Views/UIView+React.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "UIView+React.h"
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index e15aff52a8f99e..fdea9de2db7eb1 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -297,7 +297,7 @@ dependencies {
     testCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"
     testCompile "org.easytesting:fest-assert-core:${FEST_ASSERT_CORE_VERSION}"
     testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
-
+    
     androidTestCompile fileTree(dir: 'src/main/third-party/java/buck-android-support/', include: ['*.jar'])
     androidTestCompile 'com.android.support.test:runner:0.3'
     androidTestCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 9b7ac6d1254dc8..aff1e36757f5c2 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1000.0.0-master
+VERSION_NAME=0.55.4
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
diff --git a/ReactAndroid/release.gradle b/ReactAndroid/release.gradle
index 51e431a98e9a22..3e67beb0a3f270 100644
--- a/ReactAndroid/release.gradle
+++ b/ReactAndroid/release.gradle
@@ -12,15 +12,15 @@ def isReleaseBuild() {
 }
 
 def getRepositoryUrl() {
-    return hasProperty('repositoryUrl') ? property('repositoryUrl') : 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+    return project.hasProperty('repositoryUrl') ? property('repositoryUrl') : 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
 }
 
 def getRepositoryUsername() {
-    return hasProperty('repositoryUsername') ? property('repositoryUsername') : ''
+    return project.hasProperty('repositoryUsername') ? property('repositoryUsername') : ''
 }
 
 def getRepositoryPassword() {
-    return hasProperty('repositoryPassword') ? property('repositoryPassword') : ''
+    return project.hasProperty('repositoryPassword') ? property('repositoryPassword') : ''
 }
 
 def configureReactNativePom(def pom) {
@@ -39,7 +39,7 @@ def configureReactNativePom(def pom) {
 
         licenses {
             license {
-                name 'BSD License'
+                name 'MIT License'
                 url 'https://github.com/facebook/react-native/blob/master/LICENSE'
                 distribution 'repo'
             }
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java
index 159fee03ecb87c..713ab5962d6d40 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java
index 4379470164fc54..0d1e87860033e6 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java
index e62d09ecb0c14a..2d52005eb0976a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java
index 45dcff4114b0d0..b5bf197683c4e1 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java
index 9def548b072eec..cdfb21491bdba0 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java
index 5cf7e4373ef600..7806dacdf62ce6 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java
index 1ddf186c90de2f..59b949e979509e 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java
index a996403d44f337..6073cd6b96e5e2 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
index eeb8c02e06715d..8b93eeb8b19a87 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
index 9ba33a3fc4c223..96c18030635055 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
index f58efec73f1a46..4f37e63f7d97bc 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
index 3a61f2563223d2..e08878d3c780f9 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
@@ -1,13 +1,13 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
 
+import com.facebook.react.modules.core.ReactChoreographer;
 import javax.annotation.Nullable;
 
 import java.util.concurrent.CountDownLatch;
@@ -140,6 +140,7 @@ protected Timing createTimingModule() {
         new Runnable() {
           @Override
           public void run() {
+            ReactChoreographer.initialize();
             Timing timing = new Timing(getContext(), mock(DevSupportManager.class));
             simpleSettableFuture.set(timing);
           }
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java
index 7990c398208eb7..47137dbbe177af 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java
index 7f5d2cd6c99ee1..54d03bc35f192b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java
index 6f58924f6a360d..fdf40c300f3dc5 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java
index 95dc551badd140..c15ffc29f2590c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
index 63554242b9d002..1452899dba9725 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
index 8d4da285bf2167..42eb0abfda88fa 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
index f0ae877a953d42..027291dcaf8f5b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java
index 8caa3b8f7117b1..bc827f2a85ff3c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
index 1b94b7c1fc88db..d32494f92a5d5f 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing.idledetection;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
index 4aaa451e43ab24..6509897a3425e8 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing.idledetection;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
index af6ca2ebb82a55..00f9aefaa4e99b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing.idledetection;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
index a6059a8925230f..9a6917078c78b5 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing.network;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java
index eb5a7e9d30ffed..6f3d5843b1a91e 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java
index 3b13dabeb73fc7..1a2a783dcc9beb 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
index 174444f35b4822..00dee97df81cce 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
@@ -99,7 +98,7 @@ public void run() {
     mRecordingTestModule = new RecordingTestModule();
     mCatalystInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mRecordingTestModule)
-        .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new AndroidInfoModule(getContext()))
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
index 6208e73a0cefb0..dec91a4ea5449e 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
index c47e8f2619a621..0430858c6cf46f 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java
index 6f7f5831f06c1a..4b360901013fc3 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java
index 41b7b10bcb12a3..b150641e020155 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
index c7de7b9ba02070..4d58d579139d61 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
@@ -90,7 +88,7 @@ public void run() {
 
     jsModule = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(uiManager)
-        .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new AndroidInfoModule(getContext()))
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
index 4b6e2fd2a19036..cf5949e667a81d 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java
index 951c593533e453..99de8a830014fc 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
index 7c87754e897d19..5e0b9ff62f67c8 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java
index dc02df16a14bd1..ca05cfae197fed 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java
index fbd94d6d732751..bab295fa709c42 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
index e547fed89a3a69..6888f021d9757d 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
index fdc03beaa0dd97..70dd287164bdc1 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
@@ -81,7 +80,7 @@ public void run() {
 
     mInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mUIManager)
-        .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new AndroidInfoModule(getContext()))
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
index 963442d470624d..52a8750d43066a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
index dd93ee5fccccbf..cc2f680a37941c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java
index 6ee0bed8796f27..f912347b497d82 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java
index 45a47a67383e5d..b947e50a87a405 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java
index bbef082ff10329..417bf4159b98a5 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
index 184bda6c1f6d4f..ccfa9f2b862d6a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java
index 3db5d4ee8a6896..1b0a904cdfddbc 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
index 08d19cae168923..cd0e8362d8f415 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
index 3988911c429f9d..3af83b91877572 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
index 42e0c75f081754..73412bc21239d3 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
@@ -62,7 +61,7 @@ public void run() {
 
     mCatalystInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(uiManager)
-        .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new AndroidInfoModule(getContext()))
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
diff --git a/ReactAndroid/src/androidTest/js/Asserts.js b/ReactAndroid/src/androidTest/js/Asserts.js
index 9a4e9654ad550c..0cebeea419d20d 100644
--- a/ReactAndroid/src/androidTest/js/Asserts.js
+++ b/ReactAndroid/src/androidTest/js/Asserts.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Asserts
  */
diff --git a/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js b/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js
index d9ada150d9f6bc..33f0592a4832ef 100644
--- a/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js
+++ b/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CatalystRootViewTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js b/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js
index 88c9e5fc2f1bd1..0cd5685820cacc 100644
--- a/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js
+++ b/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerDialogTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js b/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js
index 3a4f403015044c..173ef647f48267 100644
--- a/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js
+++ b/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InitialPropsTestApp
  */
diff --git a/ReactAndroid/src/androidTest/js/JSResponderTestApp.js b/ReactAndroid/src/androidTest/js/JSResponderTestApp.js
index 2d9aedd911e421..50612afb9e2e91 100644
--- a/ReactAndroid/src/androidTest/js/JSResponderTestApp.js
+++ b/ReactAndroid/src/androidTest/js/JSResponderTestApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule JSResponderTestApp
  */
diff --git a/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js b/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js
index 9b354761edc4e9..d9ecf2ca1b54e7 100644
--- a/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js
+++ b/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LayoutEventsTestApp
  */
diff --git a/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js b/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js
index 12ef60816d0645..92ac114b6cc7fd 100644
--- a/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js
+++ b/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MeasureLayoutTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js b/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js
index 38b17db2c75f94..7daa884359fa9a 100644
--- a/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js
+++ b/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MultitouchHandlingTestAppModule
  */
diff --git a/ReactAndroid/src/androidTest/js/NativeIdTestModule.js b/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
index 711f2ddce99b5a..2e1acad3422756 100644
--- a/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
+++ b/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NativeIdTestModule
  * @flow
diff --git a/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js b/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
index faba7ec7de4094..0f7255d1564089 100644
--- a/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
+++ b/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerAndroidTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js b/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js
index d27428049f29bb..bd466144c522d7 100644
--- a/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressBarTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
index 0081c50b216643..24371b0f76570c 100644
--- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ScrollViewTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/ShareTestModule.js b/ReactAndroid/src/androidTest/js/ShareTestModule.js
index 4ef9b78e6243e2..f7311f656041e9 100644
--- a/ReactAndroid/src/androidTest/js/ShareTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ShareTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ShareTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js b/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
index 4154e2a543bbe4..70fa837eed6b7a 100644
--- a/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
+++ b/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SubviewsClippingTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js b/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js
index 80e2c6eb50d24a..277a768e9430f4 100644
--- a/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js
+++ b/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeRefreshLayoutTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TestBundle.js b/ReactAndroid/src/androidTest/js/TestBundle.js
index 5cbfea239e59aa..21fd06247e415f 100644
--- a/ReactAndroid/src/androidTest/js/TestBundle.js
+++ b/ReactAndroid/src/androidTest/js/TestBundle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestBundle
  */
diff --git a/ReactAndroid/src/androidTest/js/TestIdTestModule.js b/ReactAndroid/src/androidTest/js/TestIdTestModule.js
index 962d2e6c736a85..eee76fbc05c00c 100644
--- a/ReactAndroid/src/androidTest/js/TestIdTestModule.js
+++ b/ReactAndroid/src/androidTest/js/TestIdTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestIdTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js b/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js
index eff35902c901ad..be6bfc12a3a208 100644
--- a/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestJSLocaleModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js b/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js
index a20a62c0e1a307..bc526e7722ba2d 100644
--- a/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestJSToJavaParametersModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js b/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js
index 3e18819dcdafa6..b5abe26a8eeb57 100644
--- a/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestJavaToJSArgumentsModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js b/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js
index ad42aaad8a7ec4..135816a5c9d659 100644
--- a/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestJavaToJSReturnValuesModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TextInputTestModule.js b/ReactAndroid/src/androidTest/js/TextInputTestModule.js
index 058ef7e45557cc..94593a3ab71449 100644
--- a/ReactAndroid/src/androidTest/js/TextInputTestModule.js
+++ b/ReactAndroid/src/androidTest/js/TextInputTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextInputTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js b/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js
index 7a8db9e072ed93..ebf8cdb4f1271a 100644
--- a/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js
+++ b/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimePickerDialogTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js b/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js
index 47e3d8660ef083..cd8bcb51c52842 100644
--- a/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js
+++ b/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchBubblingTestAppModule
  */
diff --git a/ReactAndroid/src/androidTest/js/UIManagerTestModule.js b/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
index 236cfce2ea387b..5c976ce76dc3f9 100644
--- a/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
+++ b/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule UIManagerTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js b/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js
index f10aeed87025ad..36d9328c93e209 100644
--- a/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewRenderingTestModule
  */
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java b/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java
index aca1cb50fb04e9..928870d2bfc434 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java b/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java
index aa9283ed2f898a..e50cd7d56bc150 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java b/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java
index 151cc8ad80f0a3..34216a29c8ff54 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java b/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java
index 28336820266728..e8fef3b4299e77 100644
--- a/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.perftest;
diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java
index 86a3f2c3fb6e2b..a2752bbb0f8a3c 100644
--- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java
+++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.proguard.annotations;
diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java
index 11f4f32b9878ac..4c261c5c9b27ea 100644
--- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java
+++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.proguard.annotations;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK
index 2fabe4a1196a40..9a33c9af419216 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK
@@ -27,6 +27,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/debug:debug"),
+        react_native_target("java/com/facebook/react/modules/fabric:fabric"),
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
         react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
index 187cabf2a69248..ab82f0d9643264 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
index 7b0ac3253bf402..c6a778a6745e55 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
@@ -81,7 +79,7 @@ public List<ModuleSpec> getNativeModules(final ReactApplicationContext reactCont
             new Provider<NativeModule>() {
               @Override
               public NativeModule get() {
-                return new AndroidInfoModule();
+                return new AndroidInfoModule(reactContext);
               }
             }),
         ModuleSpec.nativeModuleSpec(
@@ -172,7 +170,7 @@ public List<String> getViewManagerNames() {
       } else {
         return new UIManagerModule(
             reactContext,
-            mReactInstanceManager.createAllViewManagers(reactContext),
+            mReactInstanceManager.getOrCreateViewManagers(reactContext),
             mUIImplementationProvider,
             mMinTimeLeftInFrameForNonBatchedOperationMs);
       }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java b/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
index 3a83bd330b5d88..290082e545ba0c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java b/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java
index 3add544a9fd78f..6bfac567bb2a04 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
index 7a038505976746..68c184a0e1ccdf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
index 926b665e653593..bbe9cad4473816 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
@@ -77,11 +75,21 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     mDelegate.onActivityResult(requestCode, resultCode, data);
   }
 
+  @Override
+  public boolean onKeyDown(int keyCode, KeyEvent event) {
+    return mDelegate.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
+  }
+
   @Override
   public boolean onKeyUp(int keyCode, KeyEvent event) {
     return mDelegate.onKeyUp(keyCode, event) || super.onKeyUp(keyCode, event);
   }
 
+  @Override
+  public boolean onKeyLongPress(int keyCode, KeyEvent event) {
+    return mDelegate.onKeyLongPress(keyCode, event) || super.onKeyLongPress(keyCode, event);
+  }
+
   @Override
   public void onBackPressed() {
     if (!mDelegate.onBackPressed()) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
index bee643c9bbc15e..03141fb00b07b2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
@@ -127,6 +127,16 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
   }
 
+  public boolean onKeyDown(int keyCode, KeyEvent event) {
+    if (getReactNativeHost().hasInstance()
+      && getReactNativeHost().getUseDeveloperSupport()
+      && keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
+      event.startTracking();
+      return true;
+    }
+    return false;
+  }
+
   public boolean onKeyUp(int keyCode, KeyEvent event) {
     if (getReactNativeHost().hasInstance() && getReactNativeHost().getUseDeveloperSupport()) {
       if (keyCode == KeyEvent.KEYCODE_MENU) {
@@ -143,6 +153,16 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
     return false;
   }
 
+  public boolean onKeyLongPress(int keyCode, KeyEvent event) {
+    if (getReactNativeHost().hasInstance()
+        && getReactNativeHost().getUseDeveloperSupport()
+        && keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
+      getReactNativeHost().getReactInstanceManager().showDevOptionsDialog();
+      return true;
+    }
+    return false;
+  }
+
   public boolean onBackPressed() {
     if (getReactNativeHost().hasInstance()) {
       getReactNativeHost().getReactInstanceManager().onBackPressed();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
new file mode 100644
index 00000000000000..8c3df938340e47
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react;
+
+import android.view.KeyEvent;
+import android.view.View;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.common.MapBuilder;
+
+import java.util.Map;
+
+/**
+ * Responsible for dispatching events specific for hardware inputs.
+ */
+public class ReactAndroidHWInputDeviceHelper {
+
+  /**
+   * Contains a mapping between handled KeyEvents and the corresponding navigation event
+   * that should be fired when the KeyEvent is received.
+   */
+  private static final Map<Integer, String> KEY_EVENTS_ACTIONS = MapBuilder.of(
+    KeyEvent.KEYCODE_DPAD_CENTER,
+    "select",
+    KeyEvent.KEYCODE_ENTER,
+    "select",
+    KeyEvent.KEYCODE_SPACE,
+    "select",
+    KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE,
+    "playPause",
+    KeyEvent.KEYCODE_MEDIA_REWIND,
+    "rewind",
+    KeyEvent.KEYCODE_MEDIA_FAST_FORWARD,
+    "fastForward"
+  );
+
+  /**
+   * We keep a reference to the last focused view id
+   * so that we can send it as a target for key events
+   * and be able to send a blur event when focus changes.
+   */
+  private int mLastFocusedViewId = View.NO_ID;
+
+  private final ReactRootView mReactRootView;
+
+  ReactAndroidHWInputDeviceHelper(ReactRootView mReactRootView) {
+    this.mReactRootView = mReactRootView;
+  }
+
+  /**
+   * Called from {@link ReactRootView}.
+   * This is the main place the key events are handled.
+   */
+  public void handleKeyEvent(KeyEvent ev) {
+    int eventKeyCode = ev.getKeyCode();
+    int eventKeyAction = ev.getAction();
+    if (eventKeyAction == KeyEvent.ACTION_UP && KEY_EVENTS_ACTIONS.containsKey(eventKeyCode)) {
+      dispatchEvent(KEY_EVENTS_ACTIONS.get(eventKeyCode), mLastFocusedViewId);
+    }
+  }
+
+  /**
+   * Called from {@link ReactRootView} when focused view changes.
+   */
+  public void onFocusChanged(View newFocusedView) {
+    if (mLastFocusedViewId == newFocusedView.getId()) {
+      return;
+    }
+    if (mLastFocusedViewId != View.NO_ID) {
+      dispatchEvent("blur", mLastFocusedViewId);
+    }
+    mLastFocusedViewId = newFocusedView.getId();
+    dispatchEvent("focus", newFocusedView.getId());
+  }
+
+  /**
+   * Called from {@link ReactRootView} when the whole view hierarchy looses focus.
+   */
+  public void clearFocus() {
+    if (mLastFocusedViewId != View.NO_ID) {
+      dispatchEvent("blur", mLastFocusedViewId);
+    }
+    mLastFocusedViewId = View.NO_ID;
+  }
+
+  private void dispatchEvent(String eventType, int targetViewId) {
+    WritableMap event = new WritableNativeMap();
+    event.putString("eventType", eventType);
+    if (targetViewId != View.NO_ID) {
+      event.putInt("tag", targetViewId);
+    }
+    mReactRootView.sendEvent("onHWKeyEvent", event);
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java b/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java
index 6b74532dfe546e..88b7ab2093fc1b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
index 9671b0a1d70854..10bbd9d89639eb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index d1ef9b3da49053..1d2731a71c856b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
@@ -48,10 +46,10 @@
 import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.CatalystInstanceImpl;
 import com.facebook.react.bridge.JSBundleLoader;
+import com.facebook.react.bridge.JSIModulesProvider;
 import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
-import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.NativeModuleRegistry;
 import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
@@ -60,6 +58,7 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.common.LifecycleState;
@@ -76,6 +75,7 @@
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
+import com.facebook.react.modules.fabric.ReactFabric;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.UIImplementationProvider;
 import com.facebook.react.uimanager.UIManagerModule;
@@ -124,6 +124,7 @@ public interface ReactInstanceEventListener {
      */
     void onReactContextInitialized(ReactContext context);
   }
+
   private final List<ReactRootView> mAttachedRootViews = Collections.synchronizedList(
     new ArrayList<ReactRootView>());
 
@@ -156,6 +157,8 @@ public interface ReactInstanceEventListener {
   private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
   private final boolean mLazyNativeModulesEnabled;
   private final boolean mDelayViewManagerClassLoadsEnabled;
+  private final @Nullable JSIModulesProvider mJSIModulesProvider;
+  private List<ViewManager> mViewManagers;
 
   private class ReactContextInitParams {
     private final JavaScriptExecutorFactory mJsExecutorFactory;
@@ -185,25 +188,26 @@ public static ReactInstanceManagerBuilder builder() {
   }
 
   /* package */ ReactInstanceManager(
-      Context applicationContext,
-      @Nullable Activity currentActivity,
-      @Nullable DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler,
-      JavaScriptExecutorFactory javaScriptExecutorFactory,
-      @Nullable JSBundleLoader bundleLoader,
-      @Nullable String jsMainModulePath,
-      List<ReactPackage> packages,
-      boolean useDeveloperSupport,
-      @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener,
-      LifecycleState initialLifecycleState,
-      UIImplementationProvider uiImplementationProvider,
-      NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler,
-      @Nullable RedBoxHandler redBoxHandler,
-      boolean lazyNativeModulesEnabled,
-      boolean lazyViewManagersEnabled,
-      boolean delayViewManagerClassLoadsEnabled,
-      @Nullable DevBundleDownloadListener devBundleDownloadListener,
-      int minNumShakes,
-      int minTimeLeftInFrameForNonBatchedOperationMs) {
+    Context applicationContext,
+    @Nullable Activity currentActivity,
+    @Nullable DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler,
+    JavaScriptExecutorFactory javaScriptExecutorFactory,
+    @Nullable JSBundleLoader bundleLoader,
+    @Nullable String jsMainModulePath,
+    List<ReactPackage> packages,
+    boolean useDeveloperSupport,
+    @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener,
+    LifecycleState initialLifecycleState,
+    UIImplementationProvider uiImplementationProvider,
+    NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler,
+    @Nullable RedBoxHandler redBoxHandler,
+    boolean lazyNativeModulesEnabled,
+    boolean lazyViewManagersEnabled,
+    boolean delayViewManagerClassLoadsEnabled,
+    @Nullable DevBundleDownloadListener devBundleDownloadListener,
+    int minNumShakes,
+    int minTimeLeftInFrameForNonBatchedOperationMs,
+    @Nullable JSIModulesProvider jsiModulesProvider) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.ctor()");
     initializeSoLoaderIfNecessary(applicationContext);
 
@@ -252,6 +256,7 @@ public void invokeDefaultOnBackPressed() {
       }
       mPackages.addAll(packages);
     }
+    mJSIModulesProvider = jsiModulesProvider;
 
     // Instantiate ReactChoreographer in UI thread.
     ReactChoreographer.initialize();
@@ -325,35 +330,6 @@ public void createReactContextInBackground() {
     recreateReactContextInBackgroundInner();
   }
 
-  @ThreadConfined(UI)
-  public void registerAdditionalPackages(List<ReactPackage> packages) {
-    if (packages == null || packages.isEmpty()) {
-      return;
-    }
-
-    // CatalystInstance hasn't been created, so add packages for later evaluation
-    if (!hasStartedCreatingInitialContext()) {
-      synchronized (mPackages) {
-        for (ReactPackage p : packages) {
-          if (!mPackages.contains(p)) {
-            mPackages.add(p);
-          }
-        }
-      }
-      return;
-    }
-
-    ReactContext context = getCurrentReactContext();
-    CatalystInstance catalystInstance = context != null ? context.getCatalystInstance() : null;
-
-    Assertions.assertNotNull(catalystInstance, "CatalystInstance null after hasStartedCreatingInitialContext true.");
-
-    final ReactApplicationContext reactContext = new ReactApplicationContext(mApplicationContext);
-
-    NativeModuleRegistry nativeModuleRegistry = processPackages(reactContext, packages, true);
-    catalystInstance.extendNativeModules(nativeModuleRegistry);
-  }
-
   /**
    * Recreate the react application and context. This should be called if configuration has changed
    * or the developer has requested the app to be reloaded. It should only be called after an
@@ -545,6 +521,16 @@ public void onHostResume(Activity activity, DefaultHardwareBackBtnHandler defaul
     UiThreadUtil.assertOnUiThread();
 
     mDefaultBackButtonImpl = defaultBackButtonImpl;
+    onHostResume(activity);
+  }
+
+  /**
+   * Use this method when the activity resumes.
+   */
+  @ThreadConfined(UI)
+  public void onHostResume(Activity activity) {
+    UiThreadUtil.assertOnUiThread();
+
     mCurrentActivity = activity;
 
     if (mUseDeveloperSupport) {
@@ -757,18 +743,23 @@ public void detachRootView(ReactRootView rootView) {
   /**
    * Uses configured {@link ReactPackage} instances to create all view managers.
    */
-  public List<ViewManager> createAllViewManagers(
+  public List<ViewManager> getOrCreateViewManagers(
       ReactApplicationContext catalystApplicationContext) {
     ReactMarker.logMarker(CREATE_VIEW_MANAGERS_START);
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createAllViewManagers");
     try {
-      synchronized (mPackages) {
-        List<ViewManager> allViewManagers = new ArrayList<>();
-        for (ReactPackage reactPackage : mPackages) {
-          allViewManagers.addAll(reactPackage.createViewManagers(catalystApplicationContext));
+      if (mViewManagers == null) {
+        synchronized (mPackages) {
+          if (mViewManagers == null) {
+            mViewManagers = new ArrayList<>();
+            for (ReactPackage reactPackage : mPackages) {
+              mViewManagers.addAll(reactPackage.createViewManagers(catalystApplicationContext));
+            }
+            return mViewManagers;
+          }
         }
-        return allViewManagers;
       }
+      return mViewManagers;
     } finally {
       Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
       ReactMarker.logMarker(CREATE_VIEW_MANAGERS_END);
@@ -1017,7 +1008,7 @@ private void attachRootViewToInstance(
       CatalystInstance catalystInstance) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.attachRootViewToInstance()");
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "attachRootViewToInstance");
-    UIManagerModule uiManagerModule = catalystInstance.getNativeModule(UIManagerModule.class);
+    UIManager uiManagerModule = rootView.isFabric() ? catalystInstance.getJSIModule(UIManager.class) : catalystInstance.getNativeModule(UIManagerModule.class);
     final int rootTag = uiManagerModule.addRootView(rootView);
     rootView.setRootViewTag(rootTag);
     rootView.invokeJSEntryPoint();
@@ -1043,8 +1034,14 @@ private void detachViewFromInstance(
       CatalystInstance catalystInstance) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.detachViewFromInstance()");
     UiThreadUtil.assertOnUiThread();
-    catalystInstance.getJSModule(AppRegistry.class)
+    if (rootView.isFabric()) {
+      catalystInstance.getJSModule(ReactFabric.class)
+        .unmountComponentAtNodeAndRemoveContainer(rootView.getId());
+    } else {
+      catalystInstance.getJSModule(AppRegistry.class)
         .unmountApplicationComponentAtRootTag(rootView.getId());
+    }
+
   }
 
   private void tearDownReactContext(ReactContext reactContext) {
@@ -1102,6 +1099,10 @@ private ReactApplicationContext createReactContext(
       Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
       ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_END);
     }
+    if (mJSIModulesProvider != null) {
+      catalystInstance.addJSIModules(mJSIModulesProvider
+        .getJSIModules(reactContext, catalystInstance.getJavaScriptContextHolder()));
+    }
 
     if (mBridgeIdleDebugListener != null) {
       catalystInstance.addBridgeIdleDebugListener(mBridgeIdleDebugListener);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
index ab5315b06dfe47..75792d83db3bea 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -7,6 +7,7 @@
 import android.app.Activity;
 import android.app.Application;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.JSIModulesProvider;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JSCJavaScriptExecutorFactory;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
@@ -48,6 +49,7 @@ public class ReactInstanceManagerBuilder {
   private @Nullable JavaScriptExecutorFactory mJavaScriptExecutorFactory;
   private int mMinNumShakes = 1;
   private int mMinTimeLeftInFrameForNonBatchedOperationMs = -1;
+  private @Nullable JSIModulesProvider mJSIModulesProvider;
 
   /* package protected */ ReactInstanceManagerBuilder() {
   }
@@ -62,6 +64,12 @@ public ReactInstanceManagerBuilder setUIImplementationProvider(
     return this;
   }
 
+  public ReactInstanceManagerBuilder setJSIModulesProvider(
+    @Nullable JSIModulesProvider jsiModulesProvider) {
+    mJSIModulesProvider = jsiModulesProvider;
+    return this;
+  }
+
   /**
    * Factory for desired implementation of JavaScriptExecutor.
    */
@@ -280,6 +288,7 @@ public ReactInstanceManager build() {
         mDelayViewManagerClassLoadsEnabled,
         mDevBundleDownloadListener,
         mMinNumShakes,
-        mMinTimeLeftInFrameForNonBatchedOperationMs);
+        mMinTimeLeftInFrameForNonBatchedOperationMs,
+      mJSIModulesProvider);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java
index 24de64936a4a99..03e872ae79da8b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
index 1c12e913e6c48e..e1537d550f36fc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
@@ -1,14 +1,13 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
 
+import com.facebook.react.bridge.JSIModulesProvider;
 import javax.annotation.Nullable;
 
 import java.util.List;
@@ -16,6 +15,7 @@
 import android.app.Application;
 
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.JSIModulesProvider;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
@@ -76,6 +76,7 @@ protected ReactInstanceManager createReactInstanceManager() {
       .setRedBoxHandler(getRedBoxHandler())
       .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
       .setUIImplementationProvider(getUIImplementationProvider())
+      .setJSIModulesProvider(getJSIModulesProvider())
       .setInitialLifecycleState(LifecycleState.BEFORE_CREATE);
 
     for (ReactPackage reactPackage : getPackages()) {
@@ -122,6 +123,11 @@ protected UIImplementationProvider getUIImplementationProvider() {
     return new UIImplementationProvider();
   }
 
+  protected @Nullable
+  JSIModulesProvider getJSIModulesProvider() {
+    return null;
+  }
+
   /**
    * Returns the name of the main module. Determines the URL used to fetch the JS bundle
    * from the packager server. It is only used when dev support is enabled.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java
index fb1f8517d731d9..51828a144a249a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index c67cab536cd656..5d4a88bc5025c1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
@@ -18,6 +16,7 @@
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
@@ -43,10 +42,10 @@
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.JSTouchDispatcher;
-import com.facebook.react.uimanager.MeasureSpecProvider;
+import com.facebook.react.uimanager.common.MeasureSpecProvider;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.RootView;
-import com.facebook.react.uimanager.SizeMonitoringFrameLayout;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
@@ -86,10 +85,12 @@ public interface ReactRootViewEventListener {
   private boolean mIsAttachedToInstance;
   private boolean mShouldLogContentAppeared;
   private final JSTouchDispatcher mJSTouchDispatcher = new JSTouchDispatcher(this);
+  private final ReactAndroidHWInputDeviceHelper mAndroidHWInputDeviceHelper = new ReactAndroidHWInputDeviceHelper(this);
   private boolean mWasMeasured = false;
   private int mWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
   private int mHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
   private @Nullable Runnable mJSEntryPoint;
+  private boolean mIsFabric = false;
 
   public ReactRootView(Context context) {
     super(context);
@@ -214,6 +215,47 @@ protected void dispatchDraw(Canvas canvas) {
     }
   }
 
+  @Override
+  public boolean dispatchKeyEvent(KeyEvent ev) {
+    if (mReactInstanceManager == null || !mIsAttachedToInstance ||
+      mReactInstanceManager.getCurrentReactContext() == null) {
+      FLog.w(
+        ReactConstants.TAG,
+        "Unable to handle key event as the catalyst instance has not been attached");
+      return super.dispatchKeyEvent(ev);
+    }
+    mAndroidHWInputDeviceHelper.handleKeyEvent(ev);
+    return super.dispatchKeyEvent(ev);
+  }
+
+  @Override
+  protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
+    if (mReactInstanceManager == null || !mIsAttachedToInstance ||
+      mReactInstanceManager.getCurrentReactContext() == null) {
+      FLog.w(
+        ReactConstants.TAG,
+        "Unable to handle focus changed event as the catalyst instance has not been attached");
+      super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+      return;
+    }
+    mAndroidHWInputDeviceHelper.clearFocus();
+    super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+  }
+
+  @Override
+  public void requestChildFocus(View child, View focused) {
+    if (mReactInstanceManager == null || !mIsAttachedToInstance ||
+      mReactInstanceManager.getCurrentReactContext() == null) {
+      FLog.w(
+        ReactConstants.TAG,
+        "Unable to handle child focus changed event as the catalyst instance has not been attached");
+      super.requestChildFocus(child, focused);
+      return;
+    }
+    mAndroidHWInputDeviceHelper.onFocusChanged(focused);
+    super.requestChildFocus(child, focused);
+  }
+
   private void dispatchJSTouchEvent(MotionEvent event) {
     if (mReactInstanceManager == null || !mIsAttachedToInstance ||
       mReactInstanceManager.getCurrentReactContext() == null) {
@@ -525,10 +567,26 @@ public void handleException(Throwable t) {
     mReactInstanceManager.getCurrentReactContext().handleException(e);
   }
 
+  public void setIsFabric(boolean isFabric) {
+    mIsFabric = isFabric;
+  }
+
+  public boolean isFabric() {
+    return mIsFabric;
+  }
+
   @Nullable
   public ReactInstanceManager getReactInstanceManager() {
     return mReactInstanceManager;
   }
+  
+  /* package */ void sendEvent(String eventName, @Nullable WritableMap params) {
+    if (mReactInstanceManager != null) {
+      mReactInstanceManager.getCurrentReactContext()
+        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        .emit(eventName, params);
+    }
+  }
 
   private class CustomGlobalLayoutListener implements ViewTreeObserver.OnGlobalLayoutListener {
     private final Rect mVisibleViewArea;
@@ -658,13 +716,5 @@ private void emitUpdateDimensionsEvent() {
           .getNativeModule(DeviceInfoModule.class)
           .emitUpdateDimensionsEvent();
     }
-
-    private void sendEvent(String eventName, @Nullable WritableMap params) {
-      if (mReactInstanceManager != null) {
-        mReactInstanceManager.getCurrentReactContext()
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-            .emit(eventName, params);
-      }
-    }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java
index e78d0ca2f13cdf..7f17809ffbb19a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java
index 0fba5f90bbb244..5b2640f60049cd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java
index 61e02b1055e900..beaa02926368ce 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java
index fa0248cb3e1947..09dbb65bc34bfc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
index ad715d45c9bac1..079a07add26733 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
 
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.JSApplicationCausedNativeException;
+import com.facebook.react.bridge.ReadableMap;
 
 /**
  * Base class for different types of animation drivers. Can be used to implement simple time-based
@@ -27,4 +27,15 @@
    * android choreographer callback.
    */
   public abstract void runAnimationStep(long frameTimeNanos);
+
+  /**
+   * This method will get called when some of the configuration gets updated while the animation is
+   * running. In that case animation should restart keeping its internal state to provide a smooth
+   * transision. E.g. in case of a spring animation we want to keep the current value and speed and
+   * start animating with the new properties (different destination or spring settings)
+   */
+  public void resetConfig(ReadableMap config) {
+    throw new JSApplicationCausedNativeException(
+            "Animation config for " + getClass().getSimpleName() + " cannot be reset");
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
index 41b6d24ff31239..1547633a386585 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
@@ -18,20 +16,28 @@
 public class DecayAnimation extends AnimationDriver {
 
   private final double mVelocity;
-  private final double mDeceleration;
 
-  private long mStartFrameTimeMillis = -1;
-  private double mFromValue = 0d;
-  private double mLastValue = 0d;
+  private double mDeceleration;
+  private long mStartFrameTimeMillis;
+  private double mFromValue;
+  private double mLastValue;
   private int mIterations;
   private int mCurrentLoop;
 
   public DecayAnimation(ReadableMap config) {
-    mVelocity = config.getDouble("velocity");
+    mVelocity = config.getDouble("velocity"); // initial velocity
+    resetConfig(config);
+  }
+
+  @Override
+  public void resetConfig(ReadableMap config) {
     mDeceleration = config.getDouble("deceleration");
     mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1;
     mCurrentLoop = 1;
     mHasFinished = mIterations == 0;
+    mStartFrameTimeMillis = -1;
+    mFromValue = 0;
+    mLastValue = 0;
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java
index bd59c807ccc88d..8f812a4b8143e7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java
index 152bc049af70e0..8dc720e72ce924 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
index 20a6a8f83348ee..e0a1b0d1234037 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
index 94b12178979326..f8fca1f9d22921 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
@@ -22,17 +20,24 @@ class FrameBasedAnimationDriver extends AnimationDriver {
   // 60FPS
   private static final double FRAME_TIME_MILLIS = 1000d / 60d;
 
-  private long mStartFrameTimeNanos = -1;
-  private final double[] mFrames;
-  private final double mToValue;
+  private long mStartFrameTimeNanos;
+  private double[] mFrames;
+  private double mToValue;
   private double mFromValue;
   private int mIterations;
   private int mCurrentLoop;
 
   FrameBasedAnimationDriver(ReadableMap config) {
+    resetConfig(config);
+  }
+
+  @Override
+  public void resetConfig(ReadableMap config) {
     ReadableArray frames = config.getArray("frames");
     int numberOfFrames = frames.size();
-    mFrames = new double[numberOfFrames];
+    if (mFrames == null || mFrames.length != numberOfFrames) {
+      mFrames = new double[numberOfFrames];
+    }
     for (int i = 0; i < numberOfFrames; i++) {
       mFrames[i] = frames.getDouble(i);
     }
@@ -40,16 +45,20 @@ class FrameBasedAnimationDriver extends AnimationDriver {
     mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1;
     mCurrentLoop = 1;
     mHasFinished = mIterations == 0;
+    mStartFrameTimeNanos = -1;
   }
 
   @Override
   public void runAnimationStep(long frameTimeNanos) {
     if (mStartFrameTimeNanos < 0) {
       mStartFrameTimeNanos = frameTimeNanos;
-      mFromValue = mAnimatedValue.mValue;
+      if (mCurrentLoop == 1) {
+        // initiate start value when animation runs for the first time
+        mFromValue = mAnimatedValue.mValue;
+      }
     }
     long timeFromStartMillis = (frameTimeNanos - mStartFrameTimeNanos) / 1000000;
-    int frameIndex = (int) (timeFromStartMillis / FRAME_TIME_MILLIS);
+    int frameIndex = (int) Math.round(timeFromStartMillis / FRAME_TIME_MILLIS);
     if (frameIndex < 0) {
       throw new IllegalStateException("Calculated frame index should never be lower than 0");
     } else if (mHasFinished) {
@@ -60,7 +69,7 @@ public void runAnimationStep(long frameTimeNanos) {
     if (frameIndex >= mFrames.length - 1) {
       nextValue = mToValue;
       if (mIterations == -1 || mCurrentLoop < mIterations) { // looping animation, return to start
-        mStartFrameTimeNanos = frameTimeNanos;
+        mStartFrameTimeNanos = -1;
         mCurrentLoop++;
       } else { // animation has completed, no more frames left
         mHasFinished = true;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java
index 6c38e12e229f29..b1a138e2b54f48 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.animated;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java
index 2bce6b806362bb..d942d757459914 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java
index 2f79e1a91ebb71..ae1a4d7b850760 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
index ac60f85c9e97db..de29f0383455f7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
index d65b20fc503794..1fad4e52d3cd4f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
@@ -105,6 +103,8 @@ public void createAnimatedNode(int tag, ReadableMap config) {
       node = new DiffClampAnimatedNode(config, this);
     } else if ("transform".equals(type)) {
       node = new TransformAnimatedNode(config, this);
+    } else if ("tracking".equals(type)) {
+      node = new TrackingAnimatedNode(config, this);
     } else {
       throw new JSApplicationIllegalArgumentException("Unsupported node type: " + type);
     }
@@ -189,6 +189,15 @@ public void startAnimatingNode(
       throw new JSApplicationIllegalArgumentException("Animated node should be of type " +
         ValueAnimatedNode.class.getName());
     }
+
+    final AnimationDriver existingDriver = mActiveAnimations.get(animationId);
+    if (existingDriver != null) {
+      // animation with the given ID is already running, we need to update its configuration instead
+      // of spawning a new one
+      existingDriver.resetConfig(animationConfig);
+      return;
+    }
+
     String type = animationConfig.getString("type");
     final AnimationDriver animation;
     if ("frames".equals(type)) {
@@ -214,10 +223,12 @@ private void stopAnimationsForNode(AnimatedNode animatedNode) {
     for (int i = 0; i < mActiveAnimations.size(); i++) {
       AnimationDriver animation = mActiveAnimations.valueAt(i);
       if (animatedNode.equals(animation.mAnimatedValue)) {
-        // Invoke animation end callback with {finished: false}
-        WritableMap endCallbackResponse = Arguments.createMap();
-        endCallbackResponse.putBoolean("finished", false);
-        animation.mEndCallback.invoke(endCallbackResponse);
+        if (animation.mEndCallback != null) {
+          // Invoke animation end callback with {finished: false}
+          WritableMap endCallbackResponse = Arguments.createMap();
+          endCallbackResponse.putBoolean("finished", false);
+          animation.mEndCallback.invoke(endCallbackResponse);
+        }
         mActiveAnimations.removeAt(i);
         i--;
       }
@@ -232,10 +243,12 @@ public void stopAnimation(int animationId) {
     for (int i = 0; i < mActiveAnimations.size(); i++) {
       AnimationDriver animation = mActiveAnimations.valueAt(i);
       if (animation.mId == animationId) {
-        // Invoke animation end callback with {finished: false}
-        WritableMap endCallbackResponse = Arguments.createMap();
-        endCallbackResponse.putBoolean("finished", false);
-        animation.mEndCallback.invoke(endCallbackResponse);
+        if (animation.mEndCallback != null) {
+          // Invoke animation end callback with {finished: false}
+          WritableMap endCallbackResponse = Arguments.createMap();
+          endCallbackResponse.putBoolean("finished", false);
+          animation.mEndCallback.invoke(endCallbackResponse);
+        }
         mActiveAnimations.removeAt(i);
         return;
       }
@@ -445,9 +458,11 @@ public void runUpdates(long frameTimeNanos) {
       for (int i = mActiveAnimations.size() - 1; i >= 0; i--) {
         AnimationDriver animation = mActiveAnimations.valueAt(i);
         if (animation.mHasFinished) {
-          WritableMap endCallbackResponse = Arguments.createMap();
-          endCallbackResponse.putBoolean("finished", true);
-          animation.mEndCallback.invoke(endCallbackResponse);
+          if (animation.mEndCallback != null) {
+            WritableMap endCallbackResponse = Arguments.createMap();
+            endCallbackResponse.putBoolean("finished", true);
+            animation.mEndCallback.invoke(endCallbackResponse);
+          }
           mActiveAnimations.removeAt(i);
         }
       }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java
index 036f88435cc21e..813d72b075e6b0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java
index 83ccc6f74a7184..3558756149b969 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java
@@ -37,24 +37,32 @@ private static class PhysicsState {
   // thresholds for determining when the spring is at rest
   private double mRestSpeedThreshold;
   private double mDisplacementFromRestThreshold;
-  private double mTimeAccumulator = 0;
+  private double mTimeAccumulator;
   // for controlling loop
   private int mIterations;
-  private int mCurrentLoop = 0;
+  private int mCurrentLoop;
   private double mOriginalValue;
 
   SpringAnimation(ReadableMap config) {
+    mCurrentState.velocity = config.getDouble("initialVelocity");
+    resetConfig(config);
+  }
+
+  @Override
+  public void resetConfig(ReadableMap config) {
     mSpringStiffness = config.getDouble("stiffness");
     mSpringDamping = config.getDouble("damping");
     mSpringMass = config.getDouble("mass");
-    mInitialVelocity = config.getDouble("initialVelocity");
-    mCurrentState.velocity = mInitialVelocity;
+    mInitialVelocity = mCurrentState.velocity;
     mEndValue = config.getDouble("toValue");
     mRestSpeedThreshold = config.getDouble("restSpeedThreshold");
     mDisplacementFromRestThreshold = config.getDouble("restDisplacementThreshold");
     mOvershootClampingEnabled = config.getBoolean("overshootClamping");
     mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1;
     mHasFinished = mIterations == 0;
+    mCurrentLoop = 0;
+    mTimeAccumulator = 0;
+    mSpringStarted = false;
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java
index be68582f818307..0b77e1f043fca5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
new file mode 100644
index 00000000000000..a339780dfdb60f
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.animated;
+
+import com.facebook.react.bridge.JavaOnlyMap;
+import com.facebook.react.bridge.ReadableMap;
+
+/* package */ class TrackingAnimatedNode extends AnimatedNode {
+
+  private final NativeAnimatedNodesManager mNativeAnimatedNodesManager;
+  private final int mAnimationId;
+  private final int mToValueNode;
+  private final int mValueNode;
+  private final JavaOnlyMap mAnimationConfig;
+
+  TrackingAnimatedNode(ReadableMap config, NativeAnimatedNodesManager nativeAnimatedNodesManager) {
+    mNativeAnimatedNodesManager = nativeAnimatedNodesManager;
+    mAnimationId = config.getInt("animationId");
+    mToValueNode = config.getInt("toValue");
+    mValueNode = config.getInt("value");
+    mAnimationConfig = JavaOnlyMap.deepClone(config.getMap("animationConfig"));
+  }
+
+  @Override
+  public void update() {
+    AnimatedNode toValue = mNativeAnimatedNodesManager.getNodeById(mToValueNode);
+    mAnimationConfig.putDouble("toValue", ((ValueAnimatedNode) toValue).getValue());
+    mNativeAnimatedNodesManager.startAnimatingNode(mAnimationId, mValueNode, mAnimationConfig, null);
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java
index 10dc12a4ac2ff3..d5f7f79b8efddd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java
index 77dc74c70d6869..a28511b481b76f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java
index e2b86a29f4b4f5..e29a94a2e46225 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java
index d393fe8325b685..2ef6befadbb964 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java b/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java
index 37a6d2a1969997..670db11335181f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java
index a3678ed91ff26c..ed192daeef3a9b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java
index 37c42bb831dd13..3f0a8d1a37c101 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java
index 74f0bedf47ef59..4df661c8be1c92 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java
index da72250548190e..dff3fa06d497a5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java
index 83dbe3d9aebc11..7a94de2ddf5da9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java
index d1acf3da59174d..e53aa8227cf678 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java
index b90740c5172c25..ab3678ff0e9310 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java
index 214c84f6671e11..e089fdec658bf0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java
index 9eb5567557a048..de4167972a66ed 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java
index 3ca9429d01928b..996e95d68f7149 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java
index 25b02f2d0d9b09..533d6717f2efa2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
index 267a9ca8e5f210..1979edaa880c6e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.bridge;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java
index fa574cc3e93aa3..651ec03a927497 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
index 4102013202bcb2..69c22f16f8b7b9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
@@ -27,5 +27,6 @@ rn_android_library(
         react_native_target("java/com/facebook/debug/holder:holder"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/model:model"),
+        react_native_target("java/com/facebook/react/uimanager/common:common"),
     ] + ([react_native_target("jni/react/jni:jni")] if not IS_OSS_BUILD else []),
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
index d43174f50632f8..694428509b1a06 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java
index ab72c46ba27565..1a7810d6f97b11 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
index 5b82505ce65a92..e1d28cfb8500e2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
index 29f03a1a17c1e0..fe6d4611226636 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
@@ -13,6 +11,7 @@
 import com.facebook.react.bridge.queue.ReactQueueConfiguration;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import java.util.Collection;
+import java.util.List;
 import javax.annotation.Nullable;
 
 /**
@@ -64,6 +63,7 @@ void callFunction(
   <T extends JavaScriptModule> T getJSModule(Class<T> jsInterface);
   <T extends NativeModule> boolean hasNativeModule(Class<T> nativeModuleInterface);
   <T extends NativeModule> T getNativeModule(Class<T> nativeModuleInterface);
+  <T extends JSIModule> T getJSIModule(Class<T> jsiModuleInterface);
   Collection<NativeModule> getNativeModules();
 
   /**
@@ -100,4 +100,6 @@ void callFunction(
    * synchronized(jsContext) { nativeThingNeedingJsContext(jsContext.get()); }
    */
   JavaScriptContextHolder getJavaScriptContextHolder();
+
+  void addJSIModules(List<JSIModuleHolder> jsiModules);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index 7afc565c2f9418..7ab1216267db6c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
@@ -28,6 +26,7 @@
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Nullable;
@@ -81,6 +80,7 @@ public String toString() {
   private final Object mJSCallsPendingInitLock = new Object();
 
   private final NativeModuleRegistry mNativeModuleRegistry;
+  private final JSIModuleRegistry mJSIModuleRegistry = new JSIModuleRegistry();
   private final NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
   private final MessageQueueThread mNativeModulesQueueThread;
   private boolean mInitialized = false;
@@ -134,8 +134,8 @@ private static class BridgeCallback implements ReactCallback {
     // and determine there's an inaccessible cycle.
     private final WeakReference<CatalystInstanceImpl> mOuter;
 
-    public BridgeCallback(CatalystInstanceImpl outer) {
-      mOuter = new WeakReference<CatalystInstanceImpl>(outer);
+    BridgeCallback(CatalystInstanceImpl outer) {
+      mOuter = new WeakReference<>(outer);
     }
 
     @Override
@@ -454,6 +454,16 @@ public JavaScriptContextHolder getJavaScriptContextHolder() {
     return mJavaScriptContextHolder;
   }
 
+  @Override
+  public void addJSIModules(List<JSIModuleHolder> jsiModules) {
+    mJSIModuleRegistry.registerModules(jsiModules);
+  }
+
+  @Override
+  public <T extends JSIModule> T getJSIModule(Class<T> jsiModuleInterface) {
+    return mJSIModuleRegistry.getModule(jsiModuleInterface);
+  }
+
   private native long getJavaScriptContext();
 
   private void incrementPendingJSCalls() {
@@ -554,6 +564,7 @@ public static class Builder {
     private @Nullable JavaScriptExecutor mJSExecutor;
     private @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
 
+
     public Builder setReactQueueConfigurationSpec(
         ReactQueueConfigurationSpec ReactQueueConfigurationSpec) {
       mReactQueueConfigurationSpec = ReactQueueConfigurationSpec;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
index 8f3471819294f9..ff5340631a214f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java
index 4d47156c747956..c730a5de7548e9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java
index b817c48a27b8ee..feeab03bb228f1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java
index 6b03442e362a31..6c107feeaa50a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java
index ce20452dd89696..4d268ea8614ccc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java
index 679f802e3dd020..816c3d6c3b1dfc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java
index 83a7fb014e34c9..749d6555338efc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
index 372b9ad90d820a..9aebad6c7182ec 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
@@ -51,6 +51,7 @@ private Inspector(HybridData hybridData) {
   public static class Page {
     private final int mId;
     private final String mTitle;
+    private final String mVM;
 
     public int getId() {
       return mId;
@@ -60,6 +61,10 @@ public String getTitle() {
       return mTitle;
     }
 
+    public String getVM() {
+      return mVM;
+    }
+
     @Override
     public String toString() {
       return "Page{" +
@@ -69,9 +74,10 @@ public String toString() {
     }
 
     @DoNotStrip
-    private Page(int id, String title) {
+    private Page(int id, String title, String vm) {
       mId = id;
       mTitle = title;
+      mVM = vm;
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java
index 2e5261b7fe3e5b..e57fe494f18001 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java
index 38ad4a2f5cfa2b..7c6d5faa893af5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java
index ad491ab50100a9..70716b269a4759 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java
index a3031d112f9ba2..61bc6f01816273 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java
index e329cf5dbfb36e..ee77eda70b984c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java
index 8cc59a876ccc7e..5e360808c03d6e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModule.java
new file mode 100644
index 00000000000000..5b9e2495449d57
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModule.java
@@ -0,0 +1,7 @@
+package com.facebook.react.bridge;
+
+/**
+ * Marker interface used to represent a JSI Module.
+ */
+public interface JSIModule {
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleHolder.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleHolder.java
new file mode 100644
index 00000000000000..de98ae54b51c8e
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleHolder.java
@@ -0,0 +1,12 @@
+package com.facebook.react.bridge;
+
+/**
+ * Holder class used to register {@link JSIModule} into JSI Bridge.
+ */
+public interface JSIModuleHolder {
+
+  Class<? extends JSIModule> getJSIModuleClass();
+
+  <T extends JSIModule> T getJSIModule();
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
new file mode 100644
index 00000000000000..913aae68bcbfa2
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
@@ -0,0 +1,23 @@
+package com.facebook.react.bridge;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.facebook.infer.annotation.Assertions;
+
+public class JSIModuleRegistry {
+
+  private final Map<Class, JSIModule> mModules = new HashMap<>();
+
+  public JSIModuleRegistry() { }
+
+  public <T extends JSIModule> T getModule(Class<T> moduleClass) {
+    return (T) Assertions.assertNotNull(mModules.get(moduleClass));
+  }
+
+  public void registerModules(List<JSIModuleHolder> jsiModules) {
+    for (JSIModuleHolder holder : jsiModules) {
+      mModules.put(holder.getJSIModuleClass(), holder.getJSIModule());
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModulesProvider.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModulesProvider.java
new file mode 100644
index 00000000000000..8abaa1ff79e2c2
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModulesProvider.java
@@ -0,0 +1,15 @@
+package com.facebook.react.bridge;
+
+import java.util.List;
+
+/**
+ * Interface used to initialize JSI Modules into the JSI Bridge.
+ */
+public interface JSIModulesProvider {
+
+  /**
+   * @return a {@link List<JSIModuleHolder>} that contain the list of JSI Modules.
+   */
+  List<JSIModuleHolder> getJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext);
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
index 43473839bd48b6..fb1333680e1241 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java
index 0b119ce7f664c1..801b550a8c1569 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java
index 63af54d2a4e3e9..e0490c10a8bb12 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
index 4e46ca4878dce5..ae91556b269034 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
index ab404d9b787f90..0533cfd3e4c829 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
@@ -36,6 +34,34 @@ public static JavaOnlyArray of(Object... values) {
     return new JavaOnlyArray(values);
   }
 
+  public static JavaOnlyArray deepClone(ReadableArray ary) {
+    JavaOnlyArray res = new JavaOnlyArray();
+    for (int i = 0, size = ary.size(); i < size; i++) {
+      ReadableType type = ary.getType(i);
+      switch (type) {
+        case Null:
+          res.pushNull();
+          break;
+        case Boolean:
+          res.pushBoolean(ary.getBoolean(i));
+          break;
+        case Number:
+          res.pushDouble(ary.getDouble(i));
+          break;
+        case String:
+          res.pushString(ary.getString(i));
+          break;
+        case Map:
+          res.pushMap(JavaOnlyMap.deepClone(ary.getMap(i)));
+          break;
+        case Array:
+          res.pushArray(deepClone(ary.getArray(i)));
+          break;
+      }
+    }
+    return res;
+  }
+
   private JavaOnlyArray(Object... values) {
     mBackingList = Arrays.asList(values);
   }
@@ -60,12 +86,12 @@ public boolean isNull(int index) {
 
   @Override
   public double getDouble(int index) {
-    return (Double) mBackingList.get(index);
+    return ((Number) mBackingList.get(index)).doubleValue();
   }
 
   @Override
   public int getInt(int index) {
-    return (Integer) mBackingList.get(index);
+    return ((Number) mBackingList.get(index)).intValue();
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
index 136786c7b75666..bce96a33921d93 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
@@ -31,6 +29,36 @@ public static JavaOnlyMap of(Object... keysAndValues) {
     return new JavaOnlyMap(keysAndValues);
   }
 
+  public static JavaOnlyMap deepClone(ReadableMap map) {
+    JavaOnlyMap res = new JavaOnlyMap();
+    ReadableMapKeySetIterator iter = map.keySetIterator();
+    while (iter.hasNextKey()) {
+      String propKey = iter.nextKey();
+      ReadableType type = map.getType(propKey);
+      switch (type) {
+        case Null:
+          res.putNull(propKey);
+          break;
+        case Boolean:
+          res.putBoolean(propKey, map.getBoolean(propKey));
+          break;
+        case Number:
+          res.putDouble(propKey, map.getDouble(propKey));
+          break;
+        case String:
+          res.putString(propKey, map.getString(propKey));
+          break;
+        case Map:
+          res.putMap(propKey, deepClone(map.getMap(propKey)));
+          break;
+        case Array:
+          res.putArray(propKey, JavaOnlyArray.deepClone(map.getArray(propKey)));
+          break;
+      }
+    }
+    return res;
+  }
+
   /**
    * @param keysAndValues keys and values, interleaved
    */
@@ -65,12 +93,12 @@ public boolean getBoolean(String name) {
 
   @Override
   public double getDouble(String name) {
-    return (Double) mBackingMap.get(name);
+    return ((Number) mBackingMap.get(name)).doubleValue();
   }
 
   @Override
   public int getInt(String name) {
-    return (Integer) mBackingMap.get(name);
+    return ((Number) mBackingMap.get(name)).intValue();
   }
 
   @Override
@@ -79,8 +107,8 @@ public String getString(String name) {
   }
 
   @Override
-  public JavaOnlyMap getMap(String name) {
-    return (JavaOnlyMap) mBackingMap.get(name);
+  public ReadableMap getMap(String name) {
+    return (ReadableMap) mBackingMap.get(name);
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java
index 562e4fde605358..e4195aff332841 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java
index 7e12b9f599fc1c..e34b4b1d00b3fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java
index af23afcfe01e30..c086508a3d6cdf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java
index 6062e81dbd5f26..5df3309135e915 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java
index 664a7a27394e82..33714b555102d8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java
index 99b6593a2e1b09..cc55b7d9259714 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java
index 169874ddfd3687..3fa44d4b8ecd3a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java
index 6eddfe56f755ea..537a610e513b27 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java
index 7efeb1476630cf..7cd373a6785ab8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java
index 26cd356cb7541d..bd314caf65985c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java
index ea0b6b1420f00a..55b32d7171d752 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
index 8dffd27badb154..a57b41f93cc698 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java
index 708bdfd8d03899..9d77885dac77c7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
index 6015b4a208cb44..d30b7a5a378890 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java
index 4d5630f9fda36e..e1b1e2829acbf8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java
index aa571141c05c50..a10fa295399dc0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java
index 9b374c145ea852..4faaa4fe363108 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java
index 25db113ae0d5a2..5448bc8fd06ad5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java
index 87a2e4b080e307..b4a075ae6c3491 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.bridge;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java
index 9e87cc1414e5dd..aa8c3bee4a83fb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java
index 519448f6d9ed79..1ee2380ff8bba6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
index 08a225948b96bb..db04655d35479c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java
index ccf9f7998355a3..1d33a2d24a2e2a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
index 89ebbd7403ee75..a9463c20dd5752 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java
index 94784cb306133f..7cd1e898142857 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
index 37bb9b64cf34f4..713f5a7fd8156e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
index 6a73f73ccb25ef..2a7c4482136ff6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java
index 821cc79a56716d..1a15f6ab31432f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java
index b0af8b48592aeb..e7dac2d49593e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
index 01c9e34a197f52..f4e17403f27cfa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java
index f035041884e170..1af1631b8a353b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java
index 9710496b602a7d..fad9c994ed728c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
index 9ed4c1ca9e7cee..2e2b13f1bcc178 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
index ea1d04d0738fb1..0cb9c10ef1c6f5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
@@ -13,6 +11,7 @@
 import com.facebook.proguard.annotations.DoNotStrip;
 
 import java.util.HashMap;
+import java.util.Iterator;
 
 import com.facebook.infer.annotation.Assertions;
 import javax.annotation.Nullable;
@@ -250,7 +249,31 @@ public HashMap<String, Object> toHashMap() {
         }
       return hashMap;
     }
-    return getLocalMap();
+
+    // we can almost just return getLocalMap(), but we need to convert nested arrays and maps to the
+    // correct types first
+    HashMap<String, Object> hashMap = new HashMap<>(getLocalMap());
+    Iterator iterator = hashMap.keySet().iterator();
+
+    while (iterator.hasNext()) {
+      String key = (String) iterator.next();
+      switch (getType(key)) {
+        case Null:
+        case Boolean:
+        case Number:
+        case String:
+          break;
+        case Map:
+          hashMap.put(key, Assertions.assertNotNull(getMap(key)).toHashMap());
+          break;
+        case Array:
+          hashMap.put(key, Assertions.assertNotNull(getArray(key)).toArrayList());
+          break;
+        default:
+          throw new IllegalArgumentException("Could not convert object with key: " + key + ".");
+      }
+    }
+    return hashMap;
   }
 
   /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java
index 0c6e2a04414d42..b1a9057e8e198b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
index 4b0396e0c21cf9..b9093263671655 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
new file mode 100644
index 00000000000000..6cbca5de698f86
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
@@ -0,0 +1,13 @@
+package com.facebook.react.bridge;
+
+import com.facebook.react.uimanager.common.MeasureSpecProvider;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
+
+public interface UIManager extends JSIModule {
+
+  /**
+   * Registers a new root view.
+   */
+  <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(final T rootView);
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
index 17c8c99fe3327e..292efedd310196 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java
index fee3ebbde7baf9..f15e4886a19b03 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java
index 6861669cb4844b..0b7b5d175d5e36 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java
index 765fe39a584711..62073f177ca2db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java
index 6b30bc326b23c5..90bd2de5add358 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java
index 04e5bdfdc2e1d1..e10caeb95c28c5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java
index fca4ddc18ac914..2449cafb726c37 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java
index 6350180fdb918c..d2be287f9e338c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
index 1afaa10ce5b120..be06d0615ba44d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java
index 800371c9c854f7..c9df9ca5436c78 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java
index fa3a208f668c3d..f474e8f972e350 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java
index 9e77c7eb88c7d4..4da397799cef42 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java
index 262f4aa5c47353..4139da528c47d6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java
index b5b44a9a2c51a0..010dc872daef44 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java
index 60d7e0eb164302..cc02e072190d41 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
index a112f217c608de..d49a26b5434c2d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ArrayUtils.java b/ReactAndroid/src/main/java/com/facebook/react/common/ArrayUtils.java
new file mode 100644
index 00000000000000..0036e9bac13abb
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/ArrayUtils.java
@@ -0,0 +1,11 @@
+package com.facebook.react.common;
+
+import java.util.Arrays;
+
+public class ArrayUtils {
+
+  public static float[] copyArray(float[] array) {
+    return array == null ? null : Arrays.copyOf(array, array.length);
+  }
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java b/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java
index 804b9f54bb934c..4c10cb114f99cd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java b/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java
index d1e68004fd064a..ecb1ba83eca3ea 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java b/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java
index f6e4843b0e390e..45402ab0da5a56 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java b/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java
index 74bced6cfa94e8..883bd714ceabb6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java
index f73fbdae352dd4..151fbf144d0fcc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java b/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java
index 7de8d922fa8b45..eae26cdebb35b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java b/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java
index b3388bdbd48ae8..5d14415072fd20 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java b/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java
index ad45e838ed9c3f..3f541304849041 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java b/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java
index 49b51967315399..0c26d6c499db81 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.common;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java b/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java
index 348855edbbfa0f..4877b64ea9765f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java b/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java
index f9a71ab1832119..4d77e7f3a05dce 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common.annotations;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java b/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
index 91abd2970af4a6..dcbc7c8fd26df0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common.build;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java b/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java
index 9caf34cd62312a..aca28f748fe7db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common.futures;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java b/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
index 1d199203c423d1..e7b5380a1c56b3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- * <p/>
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
index 6cf6cb14eba3bc..b7c7ed7b962a8a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
@@ -112,90 +110,136 @@ public void downloadBundleFromURL(
             // .addHeader("Accept", "multipart/mixed")
             .build();
     mDownloadBundleFromURLCall = Assertions.assertNotNull(mClient.newCall(request));
-    mDownloadBundleFromURLCall.enqueue(new Callback() {
-      @Override
-      public void onFailure(Call call, IOException e) {
-        // ignore callback if call was cancelled
-        if (mDownloadBundleFromURLCall == null || mDownloadBundleFromURLCall.isCanceled()) {
-          mDownloadBundleFromURLCall = null;
-          return;
-        }
-        mDownloadBundleFromURLCall = null;
-
-        callback.onFailure(DebugServerException.makeGeneric(
-            "Could not connect to development server.",
-            "URL: " + call.request().url().toString(),
-            e));
-      }
+    mDownloadBundleFromURLCall.enqueue(
+        new Callback() {
+          @Override
+          public void onFailure(Call call, IOException e) {
+            // ignore callback if call was cancelled
+            if (mDownloadBundleFromURLCall == null || mDownloadBundleFromURLCall.isCanceled()) {
+              mDownloadBundleFromURLCall = null;
+              return;
+            }
+            mDownloadBundleFromURLCall = null;
 
-      @Override
-      public void onResponse(Call call, final Response response) throws IOException {
-        // ignore callback if call was cancelled
-        if (mDownloadBundleFromURLCall == null || mDownloadBundleFromURLCall.isCanceled()) {
-          mDownloadBundleFromURLCall = null;
-          return;
-        }
-        mDownloadBundleFromURLCall = null;
-
-        final String url = response.request().url().toString();
-
-        // Make sure the result is a multipart response and parse the boundary.
-        String contentType = response.header("content-type");
-        Pattern regex = Pattern.compile("multipart/mixed;.*boundary=\"([^\"]+)\"");
-        Matcher match = regex.matcher(contentType);
-        if (match.find()) {
-          String boundary = match.group(1);
-          MultipartStreamReader bodyReader = new MultipartStreamReader(response.body().source(), boundary);
-          boolean completed = bodyReader.readAllParts(new MultipartStreamReader.ChunkCallback() {
-            @Override
-            public void execute(Map<String, String> headers, Buffer body, boolean finished) throws IOException {
-              // This will get executed for every chunk of the multipart response. The last chunk
-              // (finished = true) will be the JS bundle, the other ones will be progress events
-              // encoded as JSON.
-              if (finished) {
-                // The http status code for each separate chunk is in the X-Http-Status header.
-                int status = response.code();
-                if (headers.containsKey("X-Http-Status")) {
-                  status = Integer.parseInt(headers.get("X-Http-Status"));
-                }
-                processBundleResult(url, status, Headers.of(headers), body, outputFile, bundleInfo, callback);
+            callback.onFailure(
+                DebugServerException.makeGeneric(
+                    "Could not connect to development server.",
+                    "URL: " + call.request().url().toString(),
+                    e));
+          }
+
+          @Override
+          public void onResponse(Call call, final Response response) throws IOException {
+            // ignore callback if call was cancelled
+            if (mDownloadBundleFromURLCall == null || mDownloadBundleFromURLCall.isCanceled()) {
+              mDownloadBundleFromURLCall = null;
+              return;
+            }
+            mDownloadBundleFromURLCall = null;
+
+            final String url = response.request().url().toString();
+
+            // Make sure the result is a multipart response and parse the boundary.
+            String contentType = response.header("content-type");
+            Pattern regex = Pattern.compile("multipart/mixed;.*boundary=\"([^\"]+)\"");
+            Matcher match = regex.matcher(contentType);
+            try (Response r = response) {
+              if (match.find()) {
+                processMultipartResponse(
+                  url, r, match.group(1), outputFile, bundleInfo, callback);
               } else {
-                if (!headers.containsKey("Content-Type") || !headers.get("Content-Type").equals("application/json")) {
-                  return;
-                }
+                // In case the server doesn't support multipart/mixed responses, fallback to normal
+                // download.
+                processBundleResult(
+                  url,
+                  r.code(),
+                  r.headers(),
+                  Okio.buffer(r.body().source()),
+                  outputFile,
+                  bundleInfo,
+                  callback);
+              }
+            }
+          }
+        });
+  }
 
-                try {
-                  JSONObject progress = new JSONObject(body.readUtf8());
-                  String status = null;
-                  if (progress.has("status")) {
-                    status = progress.getString("status");
+  private void processMultipartResponse(
+      final String url,
+      final Response response,
+      String boundary,
+      final File outputFile,
+      @Nullable final BundleInfo bundleInfo,
+      final DevBundleDownloadListener callback)
+      throws IOException {
+
+    MultipartStreamReader bodyReader =
+        new MultipartStreamReader(response.body().source(), boundary);
+    boolean completed =
+        bodyReader.readAllParts(
+            new MultipartStreamReader.ChunkListener() {
+              @Override
+              public void onChunkComplete(
+                  Map<String, String> headers, Buffer body, boolean isLastChunk)
+                  throws IOException {
+                // This will get executed for every chunk of the multipart response. The last chunk
+                // (isLastChunk = true) will be the JS bundle, the other ones will be progress
+                // events
+                // encoded as JSON.
+                if (isLastChunk) {
+                  // The http status code for each separate chunk is in the X-Http-Status header.
+                  int status = response.code();
+                  if (headers.containsKey("X-Http-Status")) {
+                    status = Integer.parseInt(headers.get("X-Http-Status"));
                   }
-                  Integer done = null;
-                  if (progress.has("done")) {
-                    done = progress.getInt("done");
+                  processBundleResult(
+                      url, status, Headers.of(headers), body, outputFile, bundleInfo, callback);
+                } else {
+                  if (!headers.containsKey("Content-Type")
+                      || !headers.get("Content-Type").equals("application/json")) {
+                    return;
                   }
-                  Integer total = null;
-                  if (progress.has("total")) {
-                    total = progress.getInt("total");
+
+                  try {
+                    JSONObject progress = new JSONObject(body.readUtf8());
+                    String status = null;
+                    if (progress.has("status")) {
+                      status = progress.getString("status");
+                    }
+                    Integer done = null;
+                    if (progress.has("done")) {
+                      done = progress.getInt("done");
+                    }
+                    Integer total = null;
+                    if (progress.has("total")) {
+                      total = progress.getInt("total");
+                    }
+                    callback.onProgress(status, done, total);
+                  } catch (JSONException e) {
+                    FLog.e(ReactConstants.TAG, "Error parsing progress JSON. " + e.toString());
                   }
-                  callback.onProgress(status, done, total);
-                } catch (JSONException e) {
-                  FLog.e(ReactConstants.TAG, "Error parsing progress JSON. " + e.toString());
                 }
               }
-            }
-          });
-          if (!completed) {
-            callback.onFailure(new DebugServerException(
-                "Error while reading multipart response.\n\nResponse code: " + response.code() + "\n\n" +
-                "URL: " + call.request().url().toString() + "\n\n"));
-          }
-        } else {
-          // In case the server doesn't support multipart/mixed responses, fallback to normal download.
-          processBundleResult(url, response.code(), response.headers(), Okio.buffer(response.body().source()), outputFile, bundleInfo, callback);
-        }
-      }
-    });
+
+              @Override
+              public void onChunkProgress(Map<String, String> headers, long loaded, long total)
+                  throws IOException {
+                if ("application/javascript".equals(headers.get("Content-Type"))) {
+                  callback.onProgress(
+                      "Downloading JavaScript bundle", (int) (loaded / 1024), (int) (total / 1024));
+                }
+              }
+            });
+    if (!completed) {
+      callback.onFailure(
+          new DebugServerException(
+              "Error while reading multipart response.\n\nResponse code: "
+                  + response.code()
+                  + "\n\n"
+                  + "URL: "
+                  + url.toString()
+                  + "\n\n"));
+    }
   }
 
   private void processBundleResult(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java
index c7dcad64088f5c..b56cbfc7e8c719 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
index dec05232797a03..e3204e6457bf9f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
index bb45f8d5d7da72..7641b25a3d9d07 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index 32002c750b8799..09d87f28088001 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
@@ -631,8 +629,7 @@ public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
         .url(resourceURL)
         .build();
 
-    try {
-      Response response = mClient.newCall(request).execute();
+    try (Response response = mClient.newCall(request).execute()) {
       if (!response.isSuccessful()) {
         return null;
       }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
index 3b39ea13acbaa8..757887ba7d243b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
@@ -24,7 +22,7 @@ public class DevSettingsActivity extends PreferenceActivity {
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    setTitle(R.string.catalyst_settings_title);
+    setTitle(getApplication().getResources().getString(R.string.catalyst_settings_title));
     addPreferencesFromResource(R.xml.preferences);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
index b725cfb14ed9ce..59cc883375c9e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
index c1db27fec1cf5d..c04211a98b0942 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
@@ -827,7 +825,9 @@ public void handleReloadJS() {
 
     UiThreadUtil.assertOnUiThread();
 
-    ReactMarker.logMarker(ReactMarkerConstants.RELOAD);
+    ReactMarker.logMarker(
+        ReactMarkerConstants.RELOAD,
+        mDevSettings.getPackagerConnectionSettings().getDebugServerHost());
 
     // dismiss redbox if exists
     hideRedboxDialog();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
index 51bc07e8a59c33..3441755eb94356 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java
index 71742026b370c3..a6fcfa6dcdbf21 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java
index 75dea0a30e4d05..8a65c8bc39c503 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java
index 8ef0e5e35bc114..cc1c8bf763dba2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
index 1176d38caf3ec5..8df47d9d3a076d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
@@ -154,6 +154,7 @@ private JSONArray getPages() throws JSONException {
       jsonPage.put("id", String.valueOf(page.getId()));
       jsonPage.put("title", page.getTitle());
       jsonPage.put("app", mPackageName);
+      jsonPage.put("vm", page.getVM());
       jsonPage.put("isLastBundleDownloadSuccess", bundleStatus.isLastDownloadSucess);
       jsonPage.put("bundleUpdateTimestamp", bundleStatus.updateTimestamp);
       array.put(jsonPage);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java
index b710b6de328d2d..7f99c0fd0f2f42 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java
index 049f72c3284468..c69c8eb631fb31 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java
index 3a812499713cd2..132ae6ba30a6e3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java
index ca83f57bb7b7da..d4dfb627225ada 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
index efffbae8cccabe..80eb0b6e4d51a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
@@ -26,9 +24,18 @@ public class MultipartStreamReader {
 
   private final BufferedSource mSource;
   private final String mBoundary;
-
-  public interface ChunkCallback {
-    void execute(Map<String, String> headers, Buffer body, boolean done) throws IOException;
+  private long mLastProgressEvent;
+
+  public interface ChunkListener {
+    /**
+     * Invoked when a chunk of a multipart response is fully downloaded.
+     */
+    void onChunkComplete(Map<String, String> headers, Buffer body, boolean isLastChunk) throws IOException;
+
+    /**
+     * Invoked as bytes of the current chunk are read.
+     */
+    void onChunkProgress(Map<String, String> headers, long loaded, long total) throws IOException;
   }
 
   public MultipartStreamReader(BufferedSource source, String boundary) {
@@ -55,34 +62,50 @@ private Map<String, String> parseHeaders(Buffer data) {
     return headers;
   }
 
-  private void emitChunk(Buffer chunk, boolean done, ChunkCallback callback) throws IOException {
+  private void emitChunk(Buffer chunk, boolean done, ChunkListener listener) throws IOException {
     ByteString marker = ByteString.encodeUtf8(CRLF + CRLF);
     long indexOfMarker = chunk.indexOf(marker);
     if (indexOfMarker == -1) {
-      callback.execute(null, chunk, done);
+      listener.onChunkComplete(null, chunk, done);
     } else {
       Buffer headers = new Buffer();
       Buffer body = new Buffer();
       chunk.read(headers, indexOfMarker);
       chunk.skip(marker.size());
       chunk.readAll(body);
-      callback.execute(parseHeaders(headers), body, done);
+      listener.onChunkComplete(parseHeaders(headers), body, done);
+    }
+  }
+
+  private void emitProgress(Map<String, String> headers, long contentLength, boolean isFinal, ChunkListener listener) throws IOException {
+    if (headers == null || listener == null) {
+      return;
+    }
+
+    long currentTime = System.currentTimeMillis();
+    if (currentTime - mLastProgressEvent > 16 || isFinal) {
+      mLastProgressEvent = currentTime;
+      long headersContentLength = headers.get("Content-Length") != null ? Long.parseLong(headers.get("Content-Length")) : 0;
+      listener.onChunkProgress(headers, contentLength, headersContentLength);
     }
   }
 
   /**
-   * Reads all parts of the multipart response and execute the callback for each chunk received.
-   * @param callback Callback executed when a chunk is received
+   * Reads all parts of the multipart response and execute the listener for each chunk received.
+   * @param listener Listener invoked when chunks are received.
    * @return If the read was successful
    */
-  public boolean readAllParts(ChunkCallback callback) throws IOException {
+  public boolean readAllParts(ChunkListener listener) throws IOException {
     ByteString delimiter = ByteString.encodeUtf8(CRLF + "--" + mBoundary + CRLF);
     ByteString closeDelimiter = ByteString.encodeUtf8(CRLF + "--" + mBoundary + "--" + CRLF);
+    ByteString headersDelimiter = ByteString.encodeUtf8(CRLF + CRLF);
 
     int bufferLen = 4 * 1024;
     long chunkStart = 0;
     long bytesSeen = 0;
     Buffer content = new Buffer();
+    Map<String, String> currentHeaders = null;
+    long currentHeadersLength = 0;
 
     while (true) {
       boolean isCloseDelimiter = false;
@@ -98,6 +121,20 @@ public boolean readAllParts(ChunkCallback callback) throws IOException {
 
       if (indexOfDelimiter == -1) {
         bytesSeen = content.size();
+
+        if (currentHeaders == null) {
+          long indexOfHeaders = content.indexOf(headersDelimiter, searchStart);
+          if (indexOfHeaders >= 0) {
+            mSource.read(content, indexOfHeaders);
+            Buffer headers = new Buffer();
+            content.copyTo(headers, searchStart, indexOfHeaders - searchStart);
+            currentHeadersLength = headers.size() + headersDelimiter.size();
+            currentHeaders = parseHeaders(headers);
+          }
+        } else {
+          emitProgress(currentHeaders, content.size() - currentHeadersLength, false, listener);
+        }
+
         long bytesRead = mSource.read(content, bufferLen);
         if (bytesRead <= 0) {
           return false;
@@ -113,7 +150,10 @@ public boolean readAllParts(ChunkCallback callback) throws IOException {
         Buffer chunk = new Buffer();
         content.skip(chunkStart);
         content.read(chunk, length);
-        emitChunk(chunk, isCloseDelimiter, callback);
+        emitProgress(currentHeaders, chunk.size() - currentHeadersLength, true, listener);
+        emitChunk(chunk, isCloseDelimiter, listener);
+        currentHeaders = null;
+        currentHeadersLength = 0;
       } else {
         content.skip(chunkEnd);
       }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
index 3b53ffd9a0b558..7694c68db9dbca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java
index 4c4d046da66768..6d912d545f90ef 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
index ad20145a21c6b8..071e7dc4d3c6a7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
index be331756d0c1db..75ca90d532911f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java
index 858f7e004c790a..9a4a581e761bf8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java
index 3f45d3e911e5df..661a8cba243613 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java
index c0123cb5f53c89..9efe1bd75483cf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
index b12027f15308d5..4a081e56d43b67 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java
index 03f273e97e42fa..8612d2db9da5c5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.devsupport.interfaces;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java
index f5abfb9bd0489e..5fc3027c555c21 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java
index 2e9903092ded3c..3fdc1ea07e94b7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
index bc7ab5bbebc50d..a5c3d74099be35 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
@@ -1,6 +1,6 @@
 load("//ReactNative:DEFS.bzl", "rn_android_library", "react_native_dep", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "fabric",
     srcs = glob(["*.java"]),
     provided_deps = [
@@ -11,22 +11,13 @@ android_library(
         "PUBLIC",
     ],
     deps = [
-        react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-        react_native_dep("libraries/fresco/fresco-react-native:fbcore"),
-        react_native_dep("libraries/fresco/fresco-react-native:fresco-drawee"),
-        react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"),
-        react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
-        react_native_dep("libraries/textlayoutbuilder:textlayoutbuilder"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
-        react_native_target("java/com/facebook/react:reactAndroid"),
-        react_native_target("java/com/facebook/react/bridge:bridgeAndroid"),
-        react_native_target("java/com/facebook/react/common:commonAndroid"),
-        react_native_target("java/com/facebook/react/devsupport:devsupportAndroid"),
-        react_native_target("java/com/facebook/react/modules/core:coreAndroid"),
-        react_native_target("java/com/facebook/react/shell:shellAndroid"),
-        react_native_target("java/com/facebook/react/uimanager:uimanagerAndroid"),
-        react_native_target("java/com/facebook/react/uimanager/annotations:annotationsAndroid"),
-        react_native_target("java/com/facebook/react/module/annotations:annotationsAndroid"),
+        react_native_target("java/com/facebook/react:react"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/uimanager:uimanager"),
+        react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
+        react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
new file mode 100644
index 00000000000000..37a943afac69b7
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
@@ -0,0 +1,9 @@
+package com.facebook.react.fabric;
+
+import com.facebook.react.bridge.JavaScriptContextHolder;
+
+public interface FabricBinding {
+
+  void installFabric(JavaScriptContextHolder jsContext, FabricUIManager fabricModule);
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
new file mode 100644
index 00000000000000..6fd4c1ae2d69db
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -0,0 +1,361 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+package com.facebook.react.fabric;
+
+import static android.view.View.MeasureSpec.AT_MOST;
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.UNSPECIFIED;
+
+import android.util.Log;
+import android.view.View;
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.JavaOnlyArray;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableNativeMap;
+import com.facebook.react.bridge.UIManager;
+import com.facebook.react.modules.i18nmanager.I18nUtil;
+import com.facebook.react.uimanager.DisplayMetricsHolder;
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
+import com.facebook.react.uimanager.ReactRootViewTagGenerator;
+import com.facebook.react.uimanager.ReactShadowNode;
+import com.facebook.react.uimanager.ReactShadowNodeImpl;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIViewOperationQueue;
+import com.facebook.react.uimanager.ViewAtIndex;
+import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.uimanager.ViewManagerRegistry;
+import com.facebook.react.uimanager.common.MeasureSpecProvider;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
+
+/**
+ * This class is responsible to create, clone and update {@link ReactShadowNode} using the
+ * Fabric API.
+ */
+@SuppressWarnings("unused") // used from JNI
+public class FabricUIManager implements UIManager {
+
+  private static final String TAG = FabricUIManager.class.toString();
+  private final RootShadowNodeRegistry mRootShadowNodeRegistry = new RootShadowNodeRegistry();
+  private final ReactApplicationContext mReactApplicationContext;
+  private final ViewManagerRegistry mViewManagerRegistry;
+  private final UIViewOperationQueue mUIViewOperationQueue;
+
+  public FabricUIManager(ReactApplicationContext reactContext,
+    ViewManagerRegistry viewManagerRegistry) {
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext);
+    mReactApplicationContext = reactContext;
+    mViewManagerRegistry = viewManagerRegistry;
+    mUIViewOperationQueue = new UIViewOperationQueue(reactContext, new NativeViewHierarchyManager(viewManagerRegistry), 0);
+  }
+
+  /**
+   * Creates a new {@link ReactShadowNode}
+   */
+  @Nullable
+  public ReactShadowNode createNode(int reactTag,
+    String viewName,
+    int rootTag,
+    ReadableNativeMap props) {
+    try {
+      ViewManager viewManager = mViewManagerRegistry.get(viewName);
+      ReactShadowNode node = viewManager.createShadowNodeInstance(mReactApplicationContext);
+      ReactShadowNode rootNode = getRootNode(rootTag);
+      node.setRootNode(rootNode);
+      node.setViewClassName(viewName);
+      node.setReactTag(reactTag);
+      node.setThemedContext(rootNode.getThemedContext());
+
+      ReactStylesDiffMap styles = updateProps(node, props);
+
+      if (!node.isVirtual()) {
+        mUIViewOperationQueue
+          .enqueueCreateView(rootNode.getThemedContext(), reactTag, viewName, styles);
+      }
+      return node;
+    } catch (Throwable t) {
+      handleException(getRootNode(rootTag), t);
+      return null;
+    }
+  }
+
+  private ReactShadowNode getRootNode(int rootTag) {
+    return mRootShadowNodeRegistry.getNode(rootTag);
+  }
+
+  private ReactStylesDiffMap updateProps(ReactShadowNode node, @Nullable ReadableNativeMap props) {
+    ReactStylesDiffMap styles = null;
+    if (props != null) {
+      styles = new ReactStylesDiffMap(props);
+      node.updateProperties(styles);
+    }
+    return styles;
+  }
+
+  /**
+   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
+   * ReactShadowNode will contain a copy of all the internal data of the original node, including
+   * its children set (note that the children nodes will not be cloned).
+   */
+  @Nullable
+  public ReactShadowNode cloneNode(ReactShadowNode node) {
+    try {
+      ReactShadowNode clone = node.mutableCopy();
+      assertReactShadowNodeCopy(node, clone);
+      return clone;
+    } catch (Throwable t) {
+      handleException(node, t);
+      return null;
+    }
+  }
+
+  /**
+   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
+   * ReactShadowNode will contain a copy of all the internal data of the original node, but
+   * its children set will be empty.
+   */
+  @Nullable
+  public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
+    try {
+      ReactShadowNode clone = node.mutableCopyWithNewChildren();
+      assertReactShadowNodeCopy(node, clone);
+      return clone;
+    } catch (Throwable t) {
+      handleException(node, t);
+      return null;
+    }
+  }
+
+  /**
+   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
+   * ReactShadowNode will contain a copy of all the internal data of the original node, but its
+   * props will be overridden with the {@link ReadableMap} received by parameter.
+   */
+  @Nullable
+  public ReactShadowNode cloneNodeWithNewProps(
+      ReactShadowNode node,
+      @Nullable ReadableNativeMap newProps) {
+    try {
+      ReactShadowNode clone = node.mutableCopyWithNewProps(newProps == null ? null : new ReactStylesDiffMap(newProps));
+      assertReactShadowNodeCopy(node, clone);
+      return clone;
+    } catch (Throwable t) {
+      handleException(node, t);
+      return null;
+    }
+  }
+
+  /**
+   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
+   * ReactShadowNode will contain a copy of all the internal data of the original node, but its
+   * props will be overridden with the {@link ReadableMap} received by parameter and its children
+   * set will be empty.
+   */
+  @Nullable
+  public ReactShadowNode cloneNodeWithNewChildrenAndProps(
+      ReactShadowNode node,
+      ReadableNativeMap newProps) {
+    try {
+      ReactShadowNode clone = node.mutableCopyWithNewChildrenAndProps(newProps == null ? null : new ReactStylesDiffMap(newProps));
+      assertReactShadowNodeCopy(node, clone);
+      return clone;
+    } catch (Throwable t) {
+      handleException(node, t);
+      return null;
+    }
+  }
+
+  private void assertReactShadowNodeCopy(ReactShadowNode source, ReactShadowNode target) {
+    Assertions.assertCondition(source.getClass().equals(target.getClass()),
+      "Found " + target.getClass() + " class when expecting: " +   source.getClass() +
+        ". Check that " + source.getClass() + " implements the mutableCopy() method correctly.");
+  }
+
+  /**
+   * Appends the child {@link ReactShadowNode} to the children set of the parent
+   * {@link ReactShadowNode}.
+   */
+  @Nullable
+  public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
+    try {
+      int childIndex = parent.getChildCount();
+      parent.addChildAt(child, childIndex);
+      ViewAtIndex[] viewsToAdd =
+        new ViewAtIndex[]{new ViewAtIndex(child.getReactTag(), childIndex)};
+      if (!child.isVirtual()) {
+        mUIViewOperationQueue.enqueueManageChildren(
+          parent.getReactTag(),
+          null,
+          viewsToAdd,
+          null
+        );
+      }
+    } catch (Throwable t) {
+      handleException(parent, t);
+    }
+  }
+
+  /**
+   * @return an empty {@link List<ReactShadowNode>} that will be used to append the
+   * {@link ReactShadowNode} elements of the root. Typically this List will contain one element.
+   */
+  public List<ReactShadowNode> createChildSet(int rootTag) {
+    return new ArrayList<>(1);
+  }
+
+  /**
+   * Adds the {@link ReactShadowNode} to the {@link List<ReactShadowNode>} received by parameter.
+   */
+  public void appendChildToSet(List<ReactShadowNode> childList, ReactShadowNode child) {
+    childList.add(child);
+  }
+
+  public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
+    try {
+      ReactShadowNode rootNode = getRootNode(rootTag);
+      Assertions.assertNotNull(
+        rootNode,
+        "Root view with tag " + rootTag + " must be added before completeRoot is called");
+      for (int i = 0; i < childList.size(); i++) {
+        ReactShadowNode child = childList.get(i);
+        appendChild(rootNode, child);
+      }
+
+      notifyOnBeforeLayoutRecursive(rootNode);
+      calculateRootLayout(rootNode);
+      applyUpdatesRecursive(rootNode, 0, 0);
+      mUIViewOperationQueue
+        .dispatchViewUpdates(1, System.currentTimeMillis(), System.currentTimeMillis());
+    } catch (Exception e) {
+      handleException(getRootNode(rootTag), e);
+    }
+  }
+
+  private void notifyOnBeforeLayoutRecursive(ReactShadowNode node) {
+    if (!node.hasUpdates()) {
+      return;
+    }
+    for (int i = 0; i < node.getChildCount(); i++) {
+      notifyOnBeforeLayoutRecursive(node.getChildAt(i));
+    }
+    node.onBeforeLayout();
+  }
+
+  private void calculateRootLayout(ReactShadowNode cssRoot) {
+    cssRoot.calculateLayout();
+  }
+
+  private void applyUpdatesRecursive(
+    ReactShadowNode cssNode,
+    float absoluteX,
+    float absoluteY) {
+
+    if (!cssNode.hasUpdates()) {
+      return;
+    }
+
+    if (!cssNode.isVirtualAnchor()) {
+      for (int i = 0; i < cssNode.getChildCount(); i++) {
+        applyUpdatesRecursive(
+          cssNode.getChildAt(i),
+          absoluteX + cssNode.getLayoutX(),
+          absoluteY + cssNode.getLayoutY());
+      }
+    }
+
+    int tag = cssNode.getReactTag();
+    if (mRootShadowNodeRegistry.getNode(tag) == null) {
+      boolean frameDidChange = cssNode.dispatchUpdates(
+        absoluteX,
+        absoluteY,
+        mUIViewOperationQueue,
+        null);
+    }
+    cssNode.markUpdateSeen();
+  }
+
+  @Override
+  public <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(
+    final T rootView) {
+    int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
+    ThemedReactContext themedRootContext = new ThemedReactContext(
+      mReactApplicationContext,
+      rootView.getContext());
+
+    ReactShadowNode rootShadowNode = createRootShadowNode(rootTag, themedRootContext);
+
+    int widthMeasureSpec = rootView.getWidthMeasureSpec();
+    int heightMeasureSpec = rootView.getHeightMeasureSpec();
+    updateRootView(rootShadowNode, widthMeasureSpec, heightMeasureSpec);
+
+    mRootShadowNodeRegistry.addNode(rootShadowNode);
+    mUIViewOperationQueue.addRootView(rootTag, rootView, themedRootContext);
+    return rootTag;
+  }
+
+  public void removeRootView(int rootTag) {
+    mRootShadowNodeRegistry.removeNode(rootTag);
+  }
+
+  private ReactShadowNode createRootShadowNode(int rootTag, ThemedReactContext themedReactContext) {
+    ReactShadowNode rootNode = new ReactShadowNodeImpl();
+    I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance();
+    // TODO: setLayoutDirection for the rootNode
+    rootNode.setViewClassName("Root");
+    rootNode.setReactTag(rootTag);
+    rootNode.setThemedContext(themedReactContext);
+    return rootNode;
+  }
+
+  /**
+   * Updates the styles of the {@link ReactShadowNode} based on the Measure specs received by
+   * parameters.
+   */
+  public void updateRootView(
+    ReactShadowNode rootCSSNode, int widthMeasureSpec, int heightMeasureSpec) {
+    int widthMode = View.MeasureSpec.getMode(widthMeasureSpec);
+    int widthSize = View.MeasureSpec.getSize(widthMeasureSpec);
+    switch (widthMode) {
+      case EXACTLY:
+        rootCSSNode.setStyleWidth(widthSize);
+        break;
+      case AT_MOST:
+        rootCSSNode.setStyleMaxWidth(widthSize);
+        break;
+      case UNSPECIFIED:
+        rootCSSNode.setStyleWidthAuto();
+        break;
+    }
+
+    int heightMode = View.MeasureSpec.getMode(heightMeasureSpec);
+    int heightSize = View.MeasureSpec.getSize(heightMeasureSpec);
+    switch (heightMode) {
+      case EXACTLY:
+        rootCSSNode.setStyleHeight(heightSize);
+        break;
+      case AT_MOST:
+        rootCSSNode.setStyleMaxHeight(heightSize);
+        break;
+      case UNSPECIFIED:
+        rootCSSNode.setStyleHeightAuto();
+        break;
+    }
+  }
+
+  private void handleException(ReactShadowNode node, Throwable t) {
+    try {
+      ThemedReactContext context = node.getThemedContext();
+      // TODO move exception management to JNI side, and refactor to avoid wrapping Throwable into
+      // a RuntimeException
+      context.handleException(new RuntimeException(t));
+    } catch (Exception ex) {
+      Log.e(TAG, "Exception while executing a Fabric method", t);
+      throw new RuntimeException(ex.getMessage(), t);
+    }
+  }
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
deleted file mode 100644
index 548f31c7afda7c..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-package com.facebook.react.fabric;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.uimanager.ReactShadowNode;
-
-/**
- * <p>Native module to allow JS to create and update native Views using Fabric API.</p>
- *
- */
-@ReactModule(name = FabricUIManagerModule.NAME)
-public class FabricUIManagerModule extends ReactContextBaseJavaModule {
-
-  static final String NAME = "FabricUIManager";
-
-  public FabricUIManagerModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
-  /**
-   * Creates a new {@link ReactShadowNode}
-   */
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int createNode(int reactTag,
-      String viewName,
-      int rootTag,
-      ReadableMap props,
-      int instanceHandle) {
-    //TODO T25560658
-    return -1;
-  }
-
-  /**
-   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
-   * ReactShadowNode will contain a copy of all the internal data of the original node, including
-   * its children set (note that the children nodes will not be cloned).
-   */
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int cloneNode(int node) {
-    //TODO T25560658
-    return -1;
-  }
-
-  /**
-   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
-   * ReactShadowNode will contain a copy of all the internal data of the original node, but
-   * its children set will be empty.
-   */
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int cloneNodeWithNewChildren(int node) {
-    //TODO T25560658
-    return -1;
-  }
-
-  /**
-   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
-   * ReactShadowNode will contain a copy of all the internal data of the original node, but its
-   * props will be overridden with the {@link ReadableMap} received by parameter.
-   */
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int cloneNodeWithNewProps(int node, ReadableMap newProps) {
-    //TODO T25560658
-    return -1;
-  }
-
-  /**
-   * @return a clone of the {@link ReactShadowNode} received by parameter. The cloned
-   * ReactShadowNode will contain a copy of all the internal data of the original node, but its
-   * props will be overridden with the {@link ReadableMap} received by parameter and its children
-   * set will be empty.
-   */
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int cloneNodeWithNewChildrenAndProps(
-      int node,
-      ReadableMap newProps) {
-    //TODO T25560658
-    return -1;
-  }
-
-  /**
-   * Appends the child {@link ReactShadowNode} to the children set of the parent
-   * {@link ReactShadowNode}.
-   */
-  @ReactMethod
-  public void appendChild(int parent, int child) {
-    //TODO T25560658
-  }
-
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int createChildSet() {
-    //TODO T25560658
-    return -1;
-  }
-
-  @ReactMethod
-  public void appendChildToSet(int childSet, int child) {
-    //TODO T25560658
-  }
-
-  @ReactMethod
-  public void completeRoot(int rootTag, int childSet) {
-    //TODO T25560658
-  }
-
-  @Override
-  public String getName() {
-    return NAME;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java
new file mode 100644
index 00000000000000..95f2c1cedaee02
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java
@@ -0,0 +1,29 @@
+package com.facebook.react.fabric;
+
+import android.util.SparseArray;
+import com.facebook.react.uimanager.ReactShadowNode;
+
+/**
+ * Simple container class to keep track of {@link ReactShadowNode}s that represents the Root
+ * Shadow Nodes of a {@link FabricUIManager}
+ */
+public class RootShadowNodeRegistry {
+
+  private final SparseArray<ReactShadowNode> mTagsToRootNodes;
+
+  public RootShadowNodeRegistry() {
+    mTagsToRootNodes = new SparseArray<>();
+  }
+
+  public void addNode(ReactShadowNode node) {
+    mTagsToRootNodes.put(node.getReactTag(), node);
+  }
+
+  public void removeNode(int tag) {
+    mTagsToRootNodes.remove(tag);
+  }
+
+  public ReactShadowNode getNode(int tag) {
+    return mTagsToRootNodes.get(tag);
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawBorder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawBorder.java
index e8e19bf9158081..9ebbf1baabcfe9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawBorder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawBorder.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java
index f6576d71957c38..fd924b8d110445 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java
index 98d0f89d52cebc..9658620aced638 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AttachDetachListener.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AttachDetachListener.java
index af51827b9e448b..1498380f3edb0d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/AttachDetachListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AttachDetachListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/BitmapUpdateListener.java b/ReactAndroid/src/main/java/com/facebook/react/flat/BitmapUpdateListener.java
index 16432e0be13842..3eeb4888d3e3e7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/BitmapUpdateListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/BitmapUpdateListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
index 0008ee69e57781..390f8f9225e8b2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBackgroundColor.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBackgroundColor.java
index a8e62c5f87bdf0..ec9291180d7b40 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBackgroundColor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBackgroundColor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBorder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBorder.java
index 1264790961740d..d48b3d326c2a9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBorder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBorder.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommand.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommand.java
index e88436fb316ac6..b7f2d5f41f903f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommand.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommand.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommandManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommandManager.java
index 0f695f04780555..bdab8db25e8639 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommandManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommandManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImage.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImage.java
index a61ebafeaefab6..05b9503d0edea4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java
index da506de63f35b5..8797cce68e83ad 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawTextLayout.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawTextLayout.java
index 52fdb6fa0b78ab..495a53e0d06843 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawTextLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawTextLayout.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java
index b378ab22dc23c0..e2bdce5fb95201 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DraweeRequestHelper.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DraweeRequestHelper.java
index 89f4ef236ba4e8..bf32f740395e30 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DraweeRequestHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DraweeRequestHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/ElementsList.java b/ReactAndroid/src/main/java/com/facebook/react/flat/ElementsList.java
index b0e5eb86856189..e741cde43306ca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/ElementsList.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/ElementsList.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java
index c8afc3e54ac26e..f6382b80befccb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewShadowNode.java
index 64a127538dd723..09fa6a42a42969 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatMeasuredViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatMeasuredViewGroup.java
index 573f8944f08ca7..7e7ee2e46ac427 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatMeasuredViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatMeasuredViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java
index d7d74eb2e7f5a7..ac1e0aadde92a5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
@@ -21,7 +19,7 @@
 import android.view.ViewGroup;
 
 import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import com.facebook.react.uimanager.SizeMonitoringFrameLayout;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java
index 4a180685d0ee9b..01191247c84edc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java
index d339a14ba34082..b60ab205b7a406 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootViewManager.java
index 6451d62d26dd95..929c8ce81836aa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
index f9959b8b8651cf..9f96433b8094f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatTextShadowNode.java
index 893e508512c75e..90a349d2e573ba 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatTextShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
index 3eacf06ba54f49..74174d2b6ab50a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java
index d2f9bd4e6011d0..3806e2ebc602ab 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
index f46d6745b5e7fc..ae94b744b9fdfa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewManager.java
index 5bfe0aee6b6421..8969b67243b80b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FontStylingSpan.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FontStylingSpan.java
index 6fb32828f0feeb..d7490984da726a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FontStylingSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FontStylingSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/HitSlopNodeRegion.java b/ReactAndroid/src/main/java/com/facebook/react/flat/HitSlopNodeRegion.java
index 09ef242545839f..09bb2f90cb52fb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/HitSlopNodeRegion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/HitSlopNodeRegion.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/HorizontalDrawCommandManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/HorizontalDrawCommandManager.java
index e80c4a0a746cfc..9621c9b3ebeb03 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/HorizontalDrawCommandManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/HorizontalDrawCommandManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/InlineImageSpanWithPipeline.java b/ReactAndroid/src/main/java/com/facebook/react/flat/InlineImageSpanWithPipeline.java
index 47f0b2dc1cc14e..9f7aca9a72019a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/InlineImageSpanWithPipeline.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/InlineImageSpanWithPipeline.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/MoveProxy.java b/ReactAndroid/src/main/java/com/facebook/react/flat/MoveProxy.java
index 08d2e6f81dda3c..6f786b80f85459 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/MoveProxy.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/MoveProxy.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java
index 06f1b35b43e814..a930f7504daa6f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/NodeRegion.java b/ReactAndroid/src/main/java/com/facebook/react/flat/NodeRegion.java
index 36e7b765c54efd..41169f7f2de481 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/NodeRegion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/NodeRegion.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java b/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java
index 8d2881b690aaf9..77b4fb0dcd9d99 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java
index fd4da4a3d5e736..7b74a130b4964c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageViewManager.java
index 7813bc2241fab6..6d7dcd494e8bcd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTModalHostManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTModalHostManager.java
index f9f7b4d66ba6c6..1b49f57534dbb8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTModalHostManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTModalHostManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java
index 4d675b9433c950..f0a8d1d33861b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawTextManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawTextManager.java
index b50dd7a1adfb29..c1695c507489be 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawTextManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawTextManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java
index 4e07754ff8214a..683aabf6d6f7d8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java
index 8a0f937ca984a9..728df41d51d4bd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImageManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImageManager.java
index f4c73e586a7d6d..f670378585e5f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImageManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImageManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java
index 221117a6c8ab2e..77d3cd9a33b3f2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInputManager.java
index c641acd7566499..62fe19960cba5e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInputManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextManager.java
index fc94166c65e762..77ec1fb256e285 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java
index 547fe5f1838920..2beaa2230ce624 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java
index 98f861e61b99ab..2e08dde5d2116a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewPagerManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewPagerManager.java
index ea6ef191e2175c..23b00fe198431c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewPagerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewPagerManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java
index f50749fb188e32..1c0bcee7913a58 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualTextManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualTextManager.java
index d32cf8eca0493c..0c1ff3fd97863b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualTextManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualTextManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/ShadowStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/flat/ShadowStyleSpan.java
index 6f79adcb4e1f5f..a0435b409ba834 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/ShadowStyleSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/ShadowStyleSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
index 61bf2bc7797e46..301a488581c817 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/TextNodeRegion.java b/ReactAndroid/src/main/java/com/facebook/react/flat/TextNodeRegion.java
index 434520209d9855..9440ebc0835156 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/TextNodeRegion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/TextNodeRegion.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/TypefaceCache.java b/ReactAndroid/src/main/java/com/facebook/react/flat/TypefaceCache.java
index 52da24a01f9311..c684af4adaaa92 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/TypefaceCache.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/TypefaceCache.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/VerticalDrawCommandManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/VerticalDrawCommandManager.java
index 0584823b855687..9cf730fcbc4425 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/VerticalDrawCommandManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/VerticalDrawCommandManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/ViewResolver.java b/ReactAndroid/src/main/java/com/facebook/react/flat/ViewResolver.java
index 0ff867f5da7a8e..1d742ec8f1eefa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/ViewResolver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/ViewResolver.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/VirtualViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/VirtualViewManager.java
index 04078415e1e011..dc382fea10f9aa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/VirtualViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/VirtualViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java
index fd81539b4508db..af7acc6da72d55 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.jstasks;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java
index 23c9437116c5bd..e70ae678a44d9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.module.annotations;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java
index 37e07edd30a276..16b39acd67a9c0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.appregistry;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
index 78be38352c55f5..f4bc26fbafedbf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.appstate;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
index 7e1c4954af8b7e..ee62d2cd278466 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.blob;
 
@@ -80,7 +79,7 @@ public void onMessage(ByteString bytes, WritableMap params) {
       @Override
       public boolean supports(Uri uri, String responseType) {
         String scheme = uri.getScheme();
-        boolean isRemote = scheme.equals("http") || scheme.equals("https");
+        boolean isRemote = "http".equals(scheme) || "https".equals(scheme);
 
         return (!isRemote && responseType.equals("blob"));
       }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
index 2404f2dbab1393..8e46ba7f0bd066 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.blob;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java
index d8cd3c73e63e91..88a15734836385 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.blob;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
index c10c46dde89db9..eb332268ad6690 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.camera;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java
index 02ff3ec13f7ea1..930a12fb757c19 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.camera;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
index 1cae0f27284c1f..5615bbd0d1a280 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.camera;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
index 62187356b814c6..4aeaea2d7ba61b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.clipboard;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java b/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java
index 0e811e1a04817f..e085008dd48eda 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java
index bfad9499670c70..cfa29c7af11f21 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *  This file was pulled from the facebook/rebound repository.
  */
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java
index 55c2810bb1cd92..ec0e92188f15a2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java
index 806455cdae004a..11570143e09c87 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
index af6e133e5bba81..c3b995baac638a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java
index 5f4c0799d422a2..62fd4d553ac8d8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java
index 1e0ab729d5b67d..5520a713770211 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java
index 50506f99ba2581..f8c780626c9a2c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java
index c4011ea1370979..205ce21c894e68 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java
index 2f678a97b48d9a..c59d8e0e11380c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java
index 4e622f52451ec0..653b9d999edbb1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
index aeb467082c9702..0716ddaa56b6da 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java
index 50d77884110603..8ba3c5555205f2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.datepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
index 1aeea410d4e1d2..8d531ce65dd323 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.datepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java
index 5106c9cce475bd..a499657a67d273 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.datepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
index cdedafc60beb83..18c3ea2faac9db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.datepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java
index d935d58d84d542..582dc8c954e315 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.datepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
index 5e991d4c48c67d..96884ba62a24b5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.debug;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java
index 3f5876a4cb4026..37bf6596f6da76 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.debug;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java
index eda077bab8223a..ee55407636be4b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.debug;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java
index 51b9c208f9e3d9..a631589365c6a3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.debug;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java
index 6c51bc6891798d..9850d0e2722a30 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.debug.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
index d6b43bf4b795a4..ea2f46948121ff 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.deviceinfo;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
index 9f23515c63c3b7..a233b9130fc0c7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.dialog;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
index 6c2f39d180d691..df1f45aca0e0e9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.dialog;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java
index f93c8afa7110a1..dea3c71a6f60fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.dialog;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
new file mode 100644
index 00000000000000..e7b5d9a72c26cf
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
@@ -0,0 +1,14 @@
+load("//ReactNative:DEFS.bzl", "rn_android_library", "react_native_target")
+
+rn_android_library(
+    name = "fabric",
+    srcs = glob(["**/*.java"]),
+    provided_deps = [
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/ReactFabric.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/ReactFabric.java
new file mode 100644
index 00000000000000..888e9bafda3e62
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/ReactFabric.java
@@ -0,0 +1,18 @@
+package com.facebook.react.modules.fabric;
+
+import com.facebook.react.bridge.JavaScriptModule;
+
+/**
+ * JS module used to execute Fabric specific methods.
+ * Note: This is a temporary class that will be replaced when Fabric is fully integrated with the
+ * rest of the modules.
+ */
+public interface ReactFabric extends JavaScriptModule {
+
+  /**
+   * JS method used to unmount Fabric surfaces.
+   * @param rootTag {@link int} react tag of Root {@link com.facebook.react.uimanager.ReactShadowNode}
+   */
+  void unmountComponentAtNodeAndRemoveContainer(int rootTag);
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
index b4e0b997d4480d..40e0a22eb0cdb1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.fresco;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java
index a2bdfca5ba446b..40f96f7aa515f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- * <p/>
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.fresco;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java
index 9d8a34ec439793..5b89fec6a50a95 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- * <p/>
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.fresco;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
index 4124dbecd11c44..fdbf4b4ee62c9e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.i18nmanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java
index 1a2ecf11e50957..9bba7414285525 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.i18nmanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
index 92ab18ca5e3804..3e10ad9262ef88 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java
index 8d3cc8b751a424..2a4c20ed56c352 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.intent;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
index bdc908ca704c2d..ba5059f93d471c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.location;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java b/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java
index 5df0372e4993a0..82f7d0dc801544 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.location;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java
index 58c57387eba9b5..98c6a5f1761fa9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.netinfo;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java
index 15f136753ca6b6..2f23bb15c1d806 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
index fe379bb1f2e414..5534eb6449cf55 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.network;
 
@@ -266,7 +264,13 @@ public void sendRequest(
       return;
     }
 
-    Request.Builder requestBuilder = new Request.Builder().url(url);
+    Request.Builder requestBuilder;
+    try {
+      requestBuilder = new Request.Builder().url(url);
+    } catch (Exception e) {
+      ResponseUtil.onRequestError(eventEmitter, requestId, e.getMessage(), null);
+      return;
+    }
 
     if (requestId != 0) {
       requestBuilder.tag(requestId);
@@ -344,7 +348,7 @@ public void onProgress(long bytesWritten, long contentLength, boolean done) {
     }
 
     RequestBody requestBody;
-    if (data == null) {
+    if (data == null || method.toLowerCase().equals("get") || method.toLowerCase().equals("head")) {
       requestBody = RequestBodyUtil.getEmptyBody(method);
     } else if (handler != null) {
       requestBody = handler.toRequestBody(data, contentType);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java
index 9e417d00fdc7bf..25d2e521106d74 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
index c90e908ad1c931..766290c40e067b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
@@ -56,7 +54,10 @@ public static OkHttpClient createClient() {
     if (sFactory != null) {
       return sFactory.createNewNetworkModuleClient();
     }
+    return createClientBuilder().build();
+  }
 
+  public static OkHttpClient.Builder createClientBuilder() {
     // No timeouts by default
     OkHttpClient.Builder client = new OkHttpClient.Builder()
       .connectTimeout(0, TimeUnit.MILLISECONDS)
@@ -64,7 +65,7 @@ public static OkHttpClient createClient() {
       .writeTimeout(0, TimeUnit.MILLISECONDS)
       .cookieJar(new ReactCookieJarContainer());
 
-    return enableTls12OnPreLollipop(client).build();
+    return enableTls12OnPreLollipop(client);
   }
 
   /*
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java
index 5cca72845cde8d..19376825dff0d6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java
index 0e478228f4e048..914ce3c901106a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java
index 1d528e77563648..afc6fdd94d26d0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java
@@ -1,10 +1,8 @@
 /**
 * Copyright (c) 2017-present, Facebook, Inc.
-* All rights reserved.
 *
-* This source code is licensed under the BSD-style license found in the
-* LICENSE file in the root directory of this source tree. An additional grant
-* of patent rights can be found in the PATENTS file in the same directory.
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
 */
 package com.facebook.react.modules.network;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java
index 121d1971b659ef..2f4c13c32c48e4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java
index cd5aabff0fdceb..5d009245d0312b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java
index 0fd2a2d8676889..0cd441e6fb5c07 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.network;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java
index 634dc89555fc05..0b943bc6c08e7d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.permissions;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java
index 06b4a1aea17084..aa9717e0b3bc15 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.share;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java
index 296e9f09c5356b..333b5ce5a4e788 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- * <p/>
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.statusbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java
index ea6487c9b49818..11f9a569e655e2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.storage;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java
index 75f25617e5071b..381b46bd02d7bf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.storage;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
index 0dba149d85d04f..c9fc96e575f169 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.storage;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java
index 9787ddf6a978a8..6e845fb802dd26 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.storage;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
index 700b6a616bb40b..bc62a544f6d347 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
@@ -1,17 +1,19 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.systeminfo;
 
+import android.app.UiModeManager;
+import android.content.res.Configuration;
 import android.os.Build;
+import android.provider.Settings.Secure;
 
-import com.facebook.react.bridge.BaseJavaModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.module.annotations.ReactModule;
 
 import java.util.HashMap;
@@ -19,14 +21,41 @@
 
 import javax.annotation.Nullable;
 
+import static android.content.Context.UI_MODE_SERVICE;
+
 /**
  * Module that exposes Android Constants to JS.
  */
 @ReactModule(name = "PlatformConstants")
-public class AndroidInfoModule extends BaseJavaModule {
+public class AndroidInfoModule extends ReactContextBaseJavaModule {
 
   private static final String IS_TESTING = "IS_TESTING";
 
+  public AndroidInfoModule(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  /**
+   * See: https://developer.android.com/reference/android/app/UiModeManager.html#getCurrentModeType()
+   */
+  private String uiMode() {
+    UiModeManager uiModeManager = (UiModeManager) getReactApplicationContext().getSystemService(UI_MODE_SERVICE);
+    switch (uiModeManager.getCurrentModeType()) {
+      case Configuration.UI_MODE_TYPE_TELEVISION:
+        return "tv";
+      case Configuration.UI_MODE_TYPE_CAR:
+        return "car";
+      case Configuration.UI_MODE_TYPE_DESK:
+        return "desk";
+      case Configuration.UI_MODE_TYPE_WATCH:
+        return "watch";
+      case Configuration.UI_MODE_TYPE_NORMAL:
+        return "normal";
+      default:
+        return "unknown";
+    }
+  }
+
   @Override
   public String getName() {
     return "PlatformConstants";
@@ -43,6 +72,8 @@ public String getName() {
     constants.put("ServerHost", AndroidInfoHelpers.getServerHost());
     constants.put("isTesting", "true".equals(System.getProperty(IS_TESTING)));
     constants.put("reactNativeVersion", ReactNativeVersion.VERSION);
+    constants.put("uiMode", uiMode());
+    constants.put("androidID", Secure.getString(getReactApplicationContext().getContentResolver(), Secure.ANDROID_ID));
     return constants;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index b6514ec58be729..57ee1c8cc62ec2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.systeminfo;
@@ -18,7 +16,7 @@
 public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
-      "minor", 0,
-      "patch", 0,
+      "minor", 55,
+      "patch", 4,
       "prerelease", null);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java
index 53da526aafda6a..8e59a1b482dc8e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java
index d745984a1d42bd..3dc5579cbd49e1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java
index 2450aa92755320..a5bf836efd5557 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java
index 178d50fd843ee5..d74f3a712ddca7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java
index 1dd547f7069f6d..26657481c87ea6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
index 6902df223e859f..a75f1a9a995cd0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.toast;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java
index 932d82a8038c4e..8d92f019337044 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.vibration;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
index c7b6c8bbe50d79..fcdb890f8c4632 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.websocket;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
index 5f55f03d8cc6f0..11cb364573728c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
index efa8fbc111296d..50340d6d5fe622 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
index dc337019cb99b3..1ff1f2c6e149a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
index 488601521364f7..5ef2b73f7bc58b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
index cc00f3d8e3fb39..46cfb6d907a196 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
index 4d7a25231ee72b..d6f97f97132a78 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
index 9e617bee728bf9..d4af3571fc736f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
index b91a0a7d1d8a08..c2d4a1f5d4792d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/SamplingProfilerPackagerMethod.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/SamplingProfilerPackagerMethod.java
index a4457d7393948a..f1de5e198efe87 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/SamplingProfilerPackagerMethod.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/SamplingProfilerPackagerMethod.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java b/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java
index a5fd60a1573a02..388709b87eaaeb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.shell;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
index 73b478ea030b03..aa8193d08e4def 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.shell;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java b/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java
index 7140e2c303fea8..c206bc725752b3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.touch;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java
index 299d2f4ae0ca5b..6bb2e71b907e10 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.touch;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java
index adda78ab020cfc..82f7f3d6bb5d2b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.touch;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java
index d7b919b7f18e98..c75c1b017f268f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.touch;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java
index 036badada735ca..615bfbbcd8f6c7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
index 2449035004f906..50a22dfcb0463a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
@@ -14,6 +14,7 @@ rn_android_library(
     exported_deps = [
         ":DisplayMetrics",
         react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_target("java/com/facebook/react/uimanager/common:common"),
     ],
     provided_deps = [
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
@@ -40,6 +41,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager/util:util"),
+        react_native_target("java/com/facebook/react/uimanager/common:common"),
         react_native_target("res:uimanager"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
index a8d130ca621aa9..4d2ad3b55d2d43 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java
index 35caa12caeeaed..79930641fbbc2c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java
index 60ea1ddc9861be..abc9d1fb4c67ba 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java
index 3f5899e55bf885..4707a9c143c5b0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
index 86abf04fdd3f19..096a7beb69f384 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
index ea83f81abc5134..b941c21672a4ae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -37,6 +37,13 @@ private static class MutableYogaValue {
     float value;
     YogaUnit unit;
 
+    private MutableYogaValue() { }
+
+    private MutableYogaValue(MutableYogaValue mutableYogaValue) {
+      this.value = mutableYogaValue.value;
+      this.unit = mutableYogaValue.unit;
+    }
+
     void setFromDynamic(Dynamic dynamic) {
       if (dynamic.isNull()) {
         unit = YogaUnit.UNDEFINED;
@@ -59,7 +66,21 @@ void setFromDynamic(Dynamic dynamic) {
     }
   }
 
-  private final MutableYogaValue mTempYogaValue = new MutableYogaValue();
+  private final MutableYogaValue mTempYogaValue;
+
+  public LayoutShadowNode() {
+    mTempYogaValue = new MutableYogaValue();
+  }
+
+  protected LayoutShadowNode(LayoutShadowNode node) {
+    super(node);
+    mTempYogaValue = new MutableYogaValue(node.mTempYogaValue);
+  }
+
+  @Override
+  public LayoutShadowNode mutableCopy() {
+    return new LayoutShadowNode(this);
+  }
 
   @ReactProp(name = ViewProps.WIDTH)
   public void setWidth(Dynamic width) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java
index 3247709e619aed..5dd2f36ac7711a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
index 66a333b41f6eac..2b259c6806ff6c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
@@ -31,6 +29,7 @@
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.touch.JSResponderHandler;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationController;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener;
 import com.facebook.systrace.Systrace;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
index f1ab0472b0ad1c..de23eeaa1cce25 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java
index d8c125a72a6ed8..7fdf9d8943533c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
index 118a1bbdc3ed6c..47de61c9a6d7fa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
index 6a3ecd0a592936..4f69c62e50059e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java
index 1d86fe7494c57c..da4f248fa76027 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java
index 1ff1bfb6074cc1..a6b0f51efcbe73 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
index eab4ae170f6156..009cab688e4ae4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java
index 980e35d6256367..4f2f27976f0a45 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java
index 345dea9f9184bc..e78f67bc9a230d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java
index e219f18ccd0857..4ac48ee9d9579d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java
index e47e13e483cb21..334b1949079749 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
index de2b4425127747..ab8e2692533ab8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.uimanager;
 
@@ -68,6 +67,17 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
    */
   boolean isYogaLeafNode();
 
+  /**
+   * @return a mutable copy of the {@link ReactShadowNode}
+   */
+  T mutableCopy();
+
+  T mutableCopyWithNewProps(@Nullable ReactStylesDiffMap newProps);
+
+  T mutableCopyWithNewChildren();
+
+  T mutableCopyWithNewChildrenAndProps(@Nullable ReactStylesDiffMap newProps);
+
   String getViewClass();
 
   boolean hasUpdates();
@@ -94,6 +104,8 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   void removeAndDisposeAllChildren();
 
+  @Nullable ReactStylesDiffMap getNewProps();
+
   /**
    * This method will be called by {@link UIManagerModule} once per batch, before calculating
    * layout. Will be only called for nodes that are marked as updated with {@link #markUpdated()} or
@@ -181,6 +193,11 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   boolean isDescendantOf(T ancestorNode);
 
+  /**
+   * @return a {@link String} representation of the Yoga hierarchy of this {@link ReactShadowNode}
+   */
+  String getHierarchyInfo();
+
   /*
    * In some cases we need a way to specify some environmental data to shadow node
    * to improve layout (or do something similar), so {@code localData} serves these needs.
@@ -191,7 +208,7 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
    * Use  {@link UIManagerModule#setViewLocalData} to set this property
    * (to provide local/environmental data for a shadow node) from the main thread.
    */
-  public void setLocalData(Object data);
+  void setLocalData(Object data);
 
   /**
    * Returns the offset within the native children owned by all layout-only nodes in the subtree
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 55c49d70e5ac19..664dd09729af13 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -1,12 +1,13 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.uimanager;
 
+import static java.lang.System.arraycopy;
+
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.uimanager.annotations.ReactPropertyHolder;
 import com.facebook.yoga.YogaAlign;
@@ -20,6 +21,7 @@
 import com.facebook.yoga.YogaJustify;
 import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaNode;
+import com.facebook.yoga.YogaNodeClonedFunction;
 import com.facebook.yoga.YogaOverflow;
 import com.facebook.yoga.YogaPositionType;
 import com.facebook.yoga.YogaValue;
@@ -54,9 +56,28 @@
 @ReactPropertyHolder
 public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl> {
 
+  private static final YogaConfig sYogaConfig;
+  static {
+    sYogaConfig = ReactYogaConfigProvider.get();
+    sYogaConfig.setOnNodeCloned(new YogaNodeClonedFunction() {
+      @Override
+      public void onNodeCloned(YogaNode oldYogaNode,
+          YogaNode newYogaNode,
+          YogaNode parent,
+          int childIndex) {
+        ReactShadowNode parentReactShadowNode = (ReactShadowNode) parent.getData();
+        Assertions.assertNotNull(parentReactShadowNode);
+
+        ReactShadowNode newReactShadowNode = (ReactShadowNode) newYogaNode.getData();
+        Assertions.assertNotNull(newReactShadowNode);
+      }
+    });
+  }
+
   private int mReactTag;
   private @Nullable String mViewClassName;
   private @Nullable ReactShadowNodeImpl mRootNode;
+  private int mRootTag;
   private @Nullable ThemedReactContext mThemedContext;
   private boolean mShouldNotifyOnLayout;
   private boolean mNodeUpdated = true;
@@ -76,26 +97,85 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
   private final float[] mPadding = new float[Spacing.ALL + 1];
   private final boolean[] mPaddingIsPercent = new boolean[Spacing.ALL + 1];
   private final YogaNode mYogaNode;
-  private static YogaConfig sYogaConfig;
+
+  private @Nullable ReactStylesDiffMap mNewProps;
 
   public ReactShadowNodeImpl() {
     if (!isVirtual()) {
       YogaNode node = YogaNodePool.get().acquire();
-      if (sYogaConfig == null) {
-        sYogaConfig = new YogaConfig();
-        sYogaConfig.setPointScaleFactor(0f);
-        sYogaConfig.setUseLegacyStretchBehaviour(true);
-      }
-      if (node == null) {
-        node = new YogaNode(sYogaConfig);
-      }
-      mYogaNode = node;
+      mYogaNode = node == null ? new YogaNode(sYogaConfig) : node;
+      mYogaNode.setData(this);
       Arrays.fill(mPadding, YogaConstants.UNDEFINED);
     } else {
       mYogaNode = null;
     }
   }
 
+  public ReactShadowNodeImpl(ReactShadowNodeImpl original) {
+    try {
+      mReactTag = original.mReactTag;
+      mRootTag = original.mRootTag;
+      mViewClassName = original.mViewClassName;
+      mRootNode = original.mRootNode;
+      mThemedContext = original.mThemedContext;
+      mShouldNotifyOnLayout = original.mShouldNotifyOnLayout;
+      mNodeUpdated = original.mNodeUpdated;
+      mChildren = original.mChildren == null ? null : new ArrayList<>(original.mChildren);
+      mIsLayoutOnly = original.mIsLayoutOnly;
+      mTotalNativeChildren = original.mTotalNativeChildren;
+      mNativeParent = original.mNativeParent;
+      mNativeChildren = original.mNativeChildren == null ? null : new ArrayList<>(original.mNativeChildren);
+      mNativeParent = original.mNativeParent;
+      mScreenX = original.mScreenX;
+      mScreenY = original.mScreenY;
+      mScreenWidth = original.mScreenWidth;
+      mScreenHeight = original.mScreenHeight;
+      arraycopy(original.mPadding, 0, mPadding, 0, original.mPadding.length);
+      arraycopy(original.mPaddingIsPercent, 0, mPaddingIsPercent, 0, original.mPaddingIsPercent.length);
+      mYogaNode = original.mYogaNode.clone();
+      mYogaNode.setData(this);
+      mParent = null;
+      mNewProps = null;
+    } catch (CloneNotSupportedException e) {
+      // it should never happen
+      throw new IllegalArgumentException();
+    }
+  }
+
+  @Override
+  public ReactShadowNodeImpl mutableCopy() {
+    return new ReactShadowNodeImpl(this);
+  }
+
+  @Override
+  public ReactShadowNodeImpl mutableCopyWithNewChildren() {
+    ReactShadowNodeImpl copy = mutableCopy();
+    copy.mNativeChildren = null;
+    copy.mChildren = null;
+    return copy;
+  }
+
+  @Override
+  public ReactShadowNodeImpl mutableCopyWithNewProps(@Nullable ReactStylesDiffMap newProps) {
+    ReactShadowNodeImpl copy = mutableCopy();
+    if (newProps != null) {
+      copy.updateProperties(newProps);
+      copy.mNewProps = newProps;
+    }
+    return copy;
+  }
+
+  @Override
+  public ReactShadowNodeImpl mutableCopyWithNewChildrenAndProps(@Nullable ReactStylesDiffMap newProps) {
+    ReactShadowNodeImpl copy = mutableCopyWithNewChildren();
+    if (newProps != null) {
+      copy.updateProperties(newProps);
+      copy.mNewProps = newProps;
+    }
+    return copy;
+  }
+
+
   /**
    * Nodes that return {@code true} will be treated as "virtual" nodes. That is, nodes that are not
    * mapped into native views (e.g. nested text node). By default this method returns {@code false}.
@@ -181,7 +261,7 @@ public void addChildAt(ReactShadowNodeImpl child, int i) {
         "Tried to add child that already has a parent! Remove it from its parent first.");
     }
     if (mChildren == null) {
-      mChildren = new ArrayList<ReactShadowNodeImpl>(4);
+      mChildren = new ArrayList<>(4);
     }
     mChildren.add(i, child);
     child.mParent = this;
@@ -194,9 +274,9 @@ public void addChildAt(ReactShadowNodeImpl child, int i) {
         throw new RuntimeException(
             "Cannot add a child that doesn't have a YogaNode to a parent without a measure "
                 + "function! (Trying to add a '"
-                + child.getClass().getSimpleName()
+                + child.toString()
                 + "' to a '"
-                + getClass().getSimpleName()
+                + toString()
                 + "')");
       }
       mYogaNode.addChildAt(childYogaNode, i);
@@ -304,6 +384,12 @@ public void onAfterUpdateTransaction() {
     // no-op
   }
 
+  @Override
+  @Nullable
+  public ReactStylesDiffMap getNewProps() {
+    return mNewProps;
+  }
+
   /**
    * Called after layout step at the end of the UI batch from {@link UIManagerModule}. May be used
    * to enqueue additional ui operations for the native view. Will only be called on nodes marked as
@@ -320,7 +406,7 @@ public boolean dispatchUpdates(
       float absoluteX,
       float absoluteY,
       UIViewOperationQueue uiViewOperationQueue,
-      NativeViewHierarchyOptimizer nativeViewHierarchyOptimizer) {
+      @Nullable NativeViewHierarchyOptimizer nativeViewHierarchyOptimizer) {
     if (mNodeUpdated) {
       onCollectExtraUpdates(uiViewOperationQueue);
     }
@@ -350,7 +436,18 @@ public boolean dispatchUpdates(
       mScreenHeight = newScreenHeight;
 
       if (layoutHasChanged) {
-        nativeViewHierarchyOptimizer.handleUpdateLayout(this);
+        //TODO: T26400974 ReactShadowNode should not depend on nativeViewHierarchyOptimizer
+        if (nativeViewHierarchyOptimizer != null) {
+          nativeViewHierarchyOptimizer.handleUpdateLayout(this);
+        } else {
+          uiViewOperationQueue.enqueueUpdateLayout(
+            getParent().getReactTag(),
+            getReactTag(),
+            getScreenX(),
+            getScreenY(),
+            getScreenWidth(),
+            getScreenHeight());
+        }
       }
 
       return layoutHasChanged;
@@ -518,6 +615,11 @@ public boolean isDescendantOf(ReactShadowNodeImpl ancestorNode) {
     return isDescendant;
   }
 
+  @Override
+  public String toString() {
+    return mViewClassName;
+  }
+
   /*
    * In some cases we need a way to specify some environmental data to shadow node
    * to improve layout (or do something similar), so {@code localData} serves these needs.
@@ -910,21 +1012,22 @@ public boolean isMeasureDefined() {
   }
 
   @Override
-  public String toString() {
+  public String getHierarchyInfo() {
     StringBuilder sb = new StringBuilder();
-    toStringWithIndentation(sb, 0);
+    getHierarchyInfoWithIndentation(sb, 0);
     return sb.toString();
   }
 
-  private void toStringWithIndentation(StringBuilder result, int level) {
+  private void getHierarchyInfoWithIndentation(StringBuilder result, int level) {
     // Spaces and tabs are dropped by IntelliJ logcat integration, so rely on __ instead.
     for (int i = 0; i < level; ++i) {
       result.append("__");
     }
 
-    result.append(getClass().getSimpleName()).append(" ");
+    result.append(getClass().getSimpleName()).append(" ").append(getReactTag()).append(" ");
     if (mYogaNode != null) {
-      result.append(getLayoutWidth()).append(",").append(getLayoutHeight());
+      result.append(getScreenX()).append(";").append(getScreenY()).append(";")
+        .append(getLayoutWidth()).append(";").append(getLayoutHeight());
     } else {
       result.append("(virtual node)");
     }
@@ -935,7 +1038,7 @@ private void toStringWithIndentation(StringBuilder result, int level) {
     }
 
     for (int i = 0; i < getChildCount(); i++) {
-      getChildAt(i).toStringWithIndentation(result, level + 1);
+      getChildAt(i).getHierarchyInfoWithIndentation(result, level + 1);
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java
index 601acfe45693ff..d57504f4bb1002 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.java
new file mode 100644
index 00000000000000..3e2b109765d441
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.java
@@ -0,0 +1,17 @@
+package com.facebook.react.uimanager;
+
+import com.facebook.yoga.YogaConfig;
+
+public class ReactYogaConfigProvider {
+
+  private static YogaConfig YOGA_CONFIG;
+
+  public static YogaConfig get() {
+    if (YOGA_CONFIG == null) {
+      YOGA_CONFIG = new YogaConfig();
+      YOGA_CONFIG.setPointScaleFactor(0f);
+      YOGA_CONFIG.setUseLegacyStretchBehaviour(true);
+    }
+    return YOGA_CONFIG;
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java
index 6863740ea3dea6..1ce0316f9b9966 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
index b9ee413b4a577a..cc6ebae5366dc3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
@@ -1,15 +1,14 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
 
 import android.view.ViewGroup;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 
 /**
  * View manager for ReactRootView components.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
index f9076cbe45b8de..98727a39a8fdbe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java
index cf25abc4d348f6..1b3cebc1fb2495 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java
index 3ddaa406330952..9430ca7a62cd5b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java
index 2dc9ffb66dc7aa..53bea8824d7607 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
index f3a1a2f10863c3..375df0d05ff884 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
index 90ad8acfd364a2..fc8c4cb1476d3e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
index b58d25aaa6f1e5..c312ff763b0691 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.uimanager;
 
@@ -26,6 +24,8 @@
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
+import com.facebook.react.uimanager.common.MeasureSpecProvider;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
index 305519af9e62c9..51e0d66e93b915 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.uimanager;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
index 7becf4ad48f221..282c92ca3814a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
@@ -30,10 +28,13 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.common.MeasureSpecProvider;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
@@ -74,7 +75,7 @@
  */
 @ReactModule(name = UIManagerModule.NAME)
 public class UIManagerModule extends ReactContextBaseJavaModule implements
-    OnBatchCompleteListener, LifecycleEventListener, PerformanceCounter {
+    OnBatchCompleteListener, LifecycleEventListener, PerformanceCounter, UIManager {
 
   /**
    * Enables lazy discovery of a specific {@link ViewManager} by its name.
@@ -289,6 +290,7 @@ public Map<String, Long> getPerformanceCounters() {
    *
    * <p>TODO(6242243): Make addRootView thread safe NB: this method is horribly not-thread-safe.
    */
+  @Override
   public <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(
       final T rootView) {
     Systrace.beginSection(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
index 8f5cba8c3bc854..1eea5018a8dfc5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
index 76e0b9ecea2d20..beb067f1313ab0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java
index 1dda859eb3f459..46e5807a3b1466 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
index c09a7cfccd4e07..1f2135db86523e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
@@ -23,6 +21,7 @@
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.modules.core.ReactChoreographer;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
@@ -765,7 +764,7 @@ public void prependUIBlock(UIBlock block) {
     mOperations.add(0, new UIBlockOperation(block));
   }
 
-  /* package */ void dispatchViewUpdates(
+  public void dispatchViewUpdates(
       final int batchId, final long commitStartTime, final long layoutTime) {
     SystraceMessage.beginSection(
       Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
index 6ceef2632d36f4..6000e0554c854f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
@@ -15,7 +13,7 @@
  * Data structure that couples view tag to it's index in parent view. Used for managing children
  * operation.
  */
-/* package */ class ViewAtIndex {
+public class ViewAtIndex {
   public static Comparator<ViewAtIndex> COMPARATOR = new Comparator<ViewAtIndex>() {
     @Override
     public int compare(ViewAtIndex lhs, ViewAtIndex rhs) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
index 5ee3cc36ab2f00..0ccacd7f5dab7e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
index 7ea9a57399f92c..b96562ed1713a4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
index 103529a0e96857..017fb5764e7237 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java
index 3b46b626841342..6c0ae3dd62d40d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
index 4972cbbde45f1e..1895adc1ad17b1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
index 66559f9e78fed0..7e71b566b5799d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
index 18f238320e4989..aee1a0c7d9a7ab 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
@@ -90,6 +88,7 @@ public class ViewProps {
   public static final String FONT_STYLE = "fontStyle";
   public static final String FONT_FAMILY = "fontFamily";
   public static final String LINE_HEIGHT = "lineHeight";
+  public static final String LETTER_SPACING = "letterSpacing";
   public static final String NEEDS_OFFSCREEN_ALPHA_COMPOSITING = "needsOffscreenAlphaCompositing";
   public static final String NUMBER_OF_LINES = "numberOfLines";
   public static final String ELLIPSIZE_MODE = "ellipsizeMode";
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java
index c71b2612376d95..ac6f5b380b3b33 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java
@@ -20,7 +20,7 @@ public static ClearableSynchronizedPool<YogaNode> get() {
 
     synchronized (sInitLock) {
       if (sPool == null) {
-        sPool = new ClearableSynchronizedPool<YogaNode>(1024);
+        sPool = new ClearableSynchronizedPool<>(1024);
       }
       return sPool;
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
new file mode 100644
index 00000000000000..5c4a5b26df6114
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
@@ -0,0 +1,12 @@
+load("//ReactNative:DEFS.bzl", "rn_android_library", "react_native_dep", "react_native_target")
+
+rn_android_library(
+    name = "common",
+    srcs = glob(["*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecProvider.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/MeasureSpecProvider.java
similarity index 90%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecProvider.java
rename to ReactAndroid/src/main/java/com/facebook/react/uimanager/common/MeasureSpecProvider.java
index b03a8362c59377..7cc657470d1b20 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/MeasureSpecProvider.java
@@ -1,6 +1,6 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.react.uimanager;
+package com.facebook.react.uimanager.common;
 
 import android.view.View;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SizeMonitoringFrameLayout.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/SizeMonitoringFrameLayout.java
similarity index 82%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/SizeMonitoringFrameLayout.java
rename to ReactAndroid/src/main/java/com/facebook/react/uimanager/common/SizeMonitoringFrameLayout.java
index fa952878dbcaac..19af1031a8e804 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SizeMonitoringFrameLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/SizeMonitoringFrameLayout.java
@@ -1,13 +1,11 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.uimanager;
+package com.facebook.react.uimanager.common;
 
 import javax.annotation.Nullable;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java
index 6f35ca06588eeb..c1ac00488f3906 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.debug;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
index 56eeabc5004b90..68d07f3f87887a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
index caaf1c6ce070e8..c53a9f3dec5fb0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java
index 6ef3011b2a8add..41328fd24c7493 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
index 4fa6f36770cb5e..b964186059f372 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
index 03d922852ea361..1d16c159523231 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java
index 3003dedb4c5d32..3ead8fc7bfe4f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java
index 36f32966114e90..6d6cac7b6cf0ed 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
index 43a12b073fde9f..cf435590f70275 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java b/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java
index d3ebe61320ac1d..7a3d5f02e0dac3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.util;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
index 2f83aeeb30522c..35cf8169ca18fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
@@ -1,14 +1,13 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
 
+import com.facebook.react.uimanager.ReactShadowNodeImpl;
 import javax.annotation.Nullable;
 
 import android.graphics.Canvas;
@@ -27,6 +26,13 @@ public class ARTGroupShadowNode extends ARTVirtualNode {
 
   protected @Nullable RectF mClipping;
 
+  public ARTGroupShadowNode() { }
+
+  public ARTGroupShadowNode(ARTGroupShadowNode node) {
+    super(node);
+    this.mClipping = new RectF(node.mClipping);
+  }
+
   @ReactProp(name = "clipping")
   public void setClipping(@Nullable ReadableArray clippingDims) {
     float[] clippingData = PropHelper.toFloatArray(clippingDims);
@@ -36,6 +42,11 @@ public void setClipping(@Nullable ReadableArray clippingDims) {
     }
   }
 
+  @Override
+  public ReactShadowNodeImpl mutableCopy() {
+    return new ARTGroupShadowNode(this);
+  }
+
   @Override
   public boolean isVirtual() {
     return true;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java
index 2bae8758dc11ee..bb98853f652f7a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
index ca5e4f136d5eba..e60ad880397b89 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
@@ -1,30 +1,28 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
 
-import javax.annotation.Nullable;
-
 import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.DashPathEffect;
+import android.graphics.LinearGradient;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.RectF;
-import android.graphics.DashPathEffect;
-import android.graphics.LinearGradient;
 import android.graphics.Shader;
-import android.graphics.Color;
-
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import javax.annotation.Nullable;
+
+import static com.facebook.react.common.ArrayUtils.copyArray;
 
 /**
  * Shadow node for virtual ARTShape view
@@ -60,6 +58,24 @@ public class ARTShapeShadowNode extends ARTVirtualNode {
   private int mStrokeCap = CAP_ROUND;
   private int mStrokeJoin = JOIN_ROUND;
 
+  public ARTShapeShadowNode() { }
+
+  public ARTShapeShadowNode(ARTShapeShadowNode node) {
+    super(node);
+    mPath = new Path(node.mPath);
+    mStrokeColor = copyArray(node.mStrokeColor);
+    mBrushData = copyArray(node.mBrushData);
+    mStrokeDash = copyArray(node.mStrokeDash);
+    mStrokeWidth = node.mStrokeWidth;
+    mStrokeCap = node.mStrokeCap;
+    mStrokeJoin = node.mStrokeJoin;
+  }
+
+  @Override
+  public ARTShapeShadowNode mutableCopy() {
+    return new ARTShapeShadowNode(this);
+  }
+
   @ReactProp(name = "d")
   public void setShapePath(@Nullable ReadableArray shapePath) {
     float[] pathData = PropHelper.toFloatArray(shapePath);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java
index ea55d0b415f112..93f2c21eb1aacd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java
index 88046a62ca261f..24787ef84a5364 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java
index e3c78600bd260b..429812e1991627 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
index d6e1583529cc29..4a52e7a28a06c1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
@@ -42,6 +40,19 @@ public class ARTTextShadowNode extends ARTShapeShadowNode {
   private @Nullable ReadableMap mFrame;
   private int mTextAlignment = TEXT_ALIGNMENT_LEFT;
 
+  public ARTTextShadowNode() { }
+
+  public ARTTextShadowNode(ARTTextShadowNode node) {
+    super(node);
+    mTextAlignment = node.mTextAlignment;
+    mFrame = node.mFrame; // copy reference as mFrame is already immutable
+  }
+
+  @Override
+  public ARTShapeShadowNode mutableCopy() {
+    return new ARTTextShadowNode(this);
+  }
+
   @ReactProp(name = "frame")
   public void setFrame(@Nullable ReadableMap frame) {
     mFrame = frame;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
index ac9739b02d4c50..158afd16eac943 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
@@ -39,6 +37,13 @@ public ARTVirtualNode() {
     mScale = DisplayMetricsHolder.getWindowDisplayMetrics().density;
   }
 
+  protected ARTVirtualNode(ARTVirtualNode artVirtualNode) {
+    super(artVirtualNode);
+    mScale = artVirtualNode.mScale;
+    mOpacity = artVirtualNode.mOpacity;
+    mMatrix = new Matrix(artVirtualNode.mMatrix);
+  }
+
   @Override
   public boolean isVirtual() {
     return true;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java
index 04497fc4d88d4d..b841cf856b1eea 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java
index 88e7f6aa745062..324a9b2c7869ff 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2017-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.checkbox;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java
index 085edcec63c25d..0f41725efdb64b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2017-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.checkbox;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java
index b064d940fa363b..e71c601f4e7b74 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2017-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.checkbox;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
index abdb4a04d4e1b6..acd637a7166e98 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
@@ -1,20 +1,20 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer;
 
 import android.support.v4.widget.DrawerLayout;
 import android.view.Gravity;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.events.NativeGestureUtil;
 
@@ -34,10 +34,18 @@ public ReactDrawerLayout(ReactContext reactContext) {
 
   @Override
   public boolean onInterceptTouchEvent(MotionEvent ev) {
-    if (super.onInterceptTouchEvent(ev)) {
-      NativeGestureUtil.notifyNativeGestureStarted(this, ev);
-      return true;
+    try {
+      if (super.onInterceptTouchEvent(ev)) {
+        NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+        return true;
+      }
+    } catch (IllegalArgumentException e) {
+      // Log and ignore the error. This seems to be a bug in the android SDK and
+      // this is the commonly accepted workaround.
+      // https://tinyurl.com/mw6qkod (Stack Overflow)
+      Log.w(ReactConstants.TAG, "Error intercepting touch event.", e);
     }
+
     return false;
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
index e61d1266e1f29e..1620d637a9d977 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
index a6845037d89702..4f51b7f596bf47 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
index b94d5937ae4510..471cd079dad652 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
index 5010ee6befa480..ca4260e44f9335 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
index a4d9294875201b..41682e17f6eb65 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
index f47c34540164c7..d21984a3f306e0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java
index ff366b0c28958c..98fb2fe7151c2d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java
index 96f22e326da2f7..3cff8b9667a292 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
index e77fd6fd98e541..21014c5c7b0fd5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
index 940ae7f1b002de..3fa2e66eb82e6d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
index 9a914cb66edbb2..116ef13bb92f7b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.imagehelper;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java
index ef3f4f981ee198..d01b314e83681a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.imagehelper;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
index 0e2a20e574a0e5..de962cecab2312 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.imagehelper;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
index 8c3b5fde63e7ba..5e429ac67bb2c6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.modal;
@@ -23,6 +21,17 @@
  */
 class ModalHostShadowNode extends LayoutShadowNode {
 
+  public ModalHostShadowNode() {}
+
+  private ModalHostShadowNode(ModalHostShadowNode node) {
+    super(node);
+  }
+
+  @Override
+  public ModalHostShadowNode mutableCopy() {
+    return new ModalHostShadowNode(this);
+  }
+
   /**
    * We need to set the styleWidth and styleHeight of the one child (represented by the <View/>
    * within the <RCTModalHostView/> in Modal.js. This needs to fill the entire window.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
index 68d4c91f1e9773..0f67e9c9e0bb13 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.modal;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
index b191afd028e3fb..1d64cb83f8f018 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.modal;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
index 133488760441bf..ec3129dc8d069d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.modal;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
index a0851ccf75e6c9..6e76cb71e66fac 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.modal;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
index cf3597d4d73823..9d0f6c9371a428 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.picker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
index ba92aa69e93be8..e099e467de8962 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.picker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
index a5e4a12b74bdab..cb0ee6d4d781ba 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.picker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
index 5e1e9ccf33a236..59f5461ab60795 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.picker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
index 3eb45f48b74424..91b15a94539f49 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.picker.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
index e8209c002b6298..5e44b62135e278 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.progressbar;
@@ -35,14 +33,30 @@ public class ProgressBarShadowNode extends LayoutShadowNode implements YogaMeasu
 
   private String mStyle = ReactProgressBarViewManager.DEFAULT_STYLE;
 
-  private final SparseIntArray mHeight = new SparseIntArray();
-  private final SparseIntArray mWidth = new SparseIntArray();
-  private final Set<Integer> mMeasured = new HashSet<>();
+  private final SparseIntArray mHeight;
+  private final SparseIntArray mWidth;
+  private final Set<Integer> mMeasured;
 
   public ProgressBarShadowNode() {
+    mHeight = new SparseIntArray();
+    mWidth = new SparseIntArray();
+    mMeasured = new HashSet<>();
     setMeasureFunction(this);
   }
 
+  public ProgressBarShadowNode(ProgressBarShadowNode node) {
+    super(node);
+    mWidth = node.mWidth.clone();
+    mHeight = node.mHeight.clone();
+    mMeasured = new HashSet<>(node.mMeasured);
+    setMeasureFunction(this);
+  }
+
+  @Override
+  public ProgressBarShadowNode mutableCopy() {
+    return new ProgressBarShadowNode(this);
+  }
+
   public @Nullable String getStyle() {
     return mStyle;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java
index 22610aaa0c63d9..e35eafe1efd9e0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.progressbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java
index dfff3149a0f987..2ce0ae2d5baa8f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java
index c0014311f9551c..b8d0c11158de37 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
index 38371436b8834a..90b9d1fc4d3a9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
@@ -17,10 +15,13 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.support.v4.view.ViewCompat;
+import android.graphics.drawable.LayerDrawable;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.HorizontalScrollView;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.MeasureSpecAssertions;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
@@ -140,12 +141,19 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
       return false;
     }
 
-    if (super.onInterceptTouchEvent(ev)) {
-      NativeGestureUtil.notifyNativeGestureStarted(this, ev);
-      ReactScrollViewHelper.emitScrollBeginDragEvent(this);
-      mDragging = true;
-      enableFpsListener();
-      return true;
+    try {
+      if (super.onInterceptTouchEvent(ev)) {
+        NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+        ReactScrollViewHelper.emitScrollBeginDragEvent(this);
+        mDragging = true;
+        enableFpsListener();
+        return true;
+      }
+    } catch (IllegalArgumentException e) {
+      // Log and ignore the error. This seems to be a bug in the android SDK and
+      // this is the commonly accepted workaround.
+      // https://tinyurl.com/mw6qkod (Stack Overflow)
+      Log.w(ReactConstants.TAG, "Error intercepting touch event.", e);
     }
 
     return false;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
index 9b59dc6c55ff56..f0d9a6011684fc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
index a9c7960cf14ae5..acf3458ef5f023 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
@@ -190,12 +188,19 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
       return false;
     }
 
-    if (super.onInterceptTouchEvent(ev)) {
-      NativeGestureUtil.notifyNativeGestureStarted(this, ev);
-      ReactScrollViewHelper.emitScrollBeginDragEvent(this);
-      mDragging = true;
-      enableFpsListener();
-      return true;
+    try {
+      if (super.onInterceptTouchEvent(ev)) {
+        NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+        ReactScrollViewHelper.emitScrollBeginDragEvent(this);
+        mDragging = true;
+        enableFpsListener();
+        return true;
+      }
+    } catch (IllegalArgumentException e) {
+      // Log and ignore the error. This seems to be a bug in the android SDK and
+      // this is the commonly accepted workaround.
+      // https://tinyurl.com/mw6qkod (Stack Overflow)
+      Log.w(ReactConstants.TAG, "Error intercepting touch event.", e);
     }
 
     return false;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java
index 0e2df5918c15d8..7eaa06386d5b71 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
index f71c2965019900..a034694b4bd9d7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
index aaba2fb7261121..ecab38a6d16e9d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
index 7dc9c4feb112f7..bf3da944d4773e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java
index 5e01b47a1b26b6..5a3810d035b3a9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java
index 612daa862b48b6..5972b25632a189 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java
index 666d9d14664f70..644be5c0bfc6cc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.slider;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
index f45dc71f301794..dabb326a530407 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.slider;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
index e1f33cb01d86af..9ab464ad0e19d6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.slider;
@@ -50,9 +48,26 @@ static class ReactSliderShadowNode extends LayoutShadowNode implements
     private boolean mMeasured;
 
     private ReactSliderShadowNode() {
+      initMeasureFunction();
+    }
+
+    private ReactSliderShadowNode(ReactSliderShadowNode node) {
+      super(node);
+      mWidth = node.mWidth;
+      mHeight = node.mHeight;
+      mMeasured = node.mMeasured;
+      initMeasureFunction();
+    }
+
+    private void initMeasureFunction() {
       setMeasureFunction(this);
     }
 
+    @Override
+    public ReactSliderShadowNode mutableCopy() {
+      return new ReactSliderShadowNode(this);
+    }
+
     @Override
     public long measure(
         YogaNode node,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
index 1dceb63ee4c685..37553abaf22c2b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.slider;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java
index 9f8ede6537c768..3ffa43dfde936e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.swiperefresh;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
index 0745d2adbecee7..c03b4a11dc3858 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.swiperefresh;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
index 99b62b4a96b67e..4988129234edd5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.swiperefresh;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
index 13b4653049d4c4..3c9dc82b848a5e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.switchview;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
index 0b60076448979a..75dfe794499e32 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.switchview;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
index 1f98b13aa6e4c6..62a3ad3f41fac3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // switchview because switch is a keyword
@@ -42,9 +40,26 @@ static class ReactSwitchShadowNode extends LayoutShadowNode implements
     private boolean mMeasured;
 
     private ReactSwitchShadowNode() {
+      initMeasureFunction();
+    }
+
+    private ReactSwitchShadowNode(ReactSwitchShadowNode node) {
+      super(node);
+      mWidth = node.mWidth;
+      mHeight = node.mHeight;
+      mMeasured = node.mMeasured;
+      initMeasureFunction();
+    }
+
+    private void initMeasureFunction() {
       setMeasureFunction(this);
     }
 
+    @Override
+    public ReactSwitchShadowNode mutableCopy() {
+      return new ReactSwitchShadowNode(this);
+    }
+
     @Override
     public long measure(
         YogaNode node,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
new file mode 100644
index 00000000000000..d41338ccd93664
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.views.text;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.text.TextPaint;
+import android.text.style.MetricAffectingSpan;
+
+import com.facebook.infer.annotation.Assertions;
+
+/**
+ * A {@link MetricAffectingSpan} that allows to set the letter spacing
+ * on the selected text span.
+ * 
+ * The letter spacing is specified in pixels, which are converted to
+ * ems at paint time; this span must therefore be applied after any
+ * spans affecting font size.
+ */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+public class CustomLetterSpacingSpan extends MetricAffectingSpan {
+
+  private final float mLetterSpacing;
+
+  public CustomLetterSpacingSpan(float letterSpacing) {
+    mLetterSpacing = letterSpacing;
+  }
+
+  @Override
+  public void updateDrawState(TextPaint paint) {
+    apply(paint);
+  }
+
+  @Override
+  public void updateMeasureState(TextPaint paint) {
+    apply(paint);
+  }
+
+  private void apply(TextPaint paint) {
+    // mLetterSpacing and paint.getTextSize() are both in pixels,
+    // yielding an accurate em value.
+    if (!Float.isNaN(mLetterSpacing)) {
+      paint.setLetterSpacing(mLetterSpacing / paint.getTextSize());
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
index 18645e56df5736..ed72dfa9b13d5e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
@@ -55,10 +53,12 @@ public void chooseHeight(
       // Show proportionally additional ascent / top & descent / bottom
       final int additional = mHeight - (-fm.top + fm.bottom);
 
-      fm.top -= additional / 2;
-      fm.ascent -= additional / 2;
-      fm.descent += additional / 2;
-      fm.bottom += additional / 2;
+      // Round up for the negative values and down for the positive values  (arbritary choice)
+      // So that bottom - top equals additional even if it's an odd number.
+      fm.top -= Math.ceil(additional / 2.0f);
+      fm.bottom += Math.floor(additional / 2.0f);
+      fm.ascent = fm.top;
+      fm.descent = fm.bottom;
     }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
index a4a1db4847cc70..127e3ab82d4d4f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java
index 51edb5a32c8778..92bfe2511aa566 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
index 5b23adab70d041..075c5be23edf3c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.text;
 
@@ -119,6 +118,14 @@ private static void buildSpannedFromShadowNode(
             new SetSpanOperation(
                 start, end, new BackgroundColorSpan(textShadowNode.mBackgroundColor)));
       }
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (textShadowNode.mLetterSpacing != Float.NaN) {
+          ops.add(new SetSpanOperation(
+            start,
+            end,
+            new CustomLetterSpacingSpan(textShadowNode.mLetterSpacing)));
+        }
+      }
       if (textShadowNode.mFontSize != UNSET) {
         ops.add(new SetSpanOperation(start, end, new AbsoluteSizeSpan(textShadowNode.mFontSize)));
       }
@@ -229,6 +236,7 @@ private static int parseNumericFontWeight(String fontWeightString) {
   }
 
   protected float mLineHeight = Float.NaN;
+  protected float mLetterSpacing = Float.NaN;
   protected boolean mIsColorSet = false;
   protected boolean mAllowFontScaling = true;
   protected int mColor;
@@ -239,6 +247,7 @@ private static int parseNumericFontWeight(String fontWeightString) {
   protected int mFontSize = UNSET;
   protected float mFontSizeInput = UNSET;
   protected float mLineHeightInput = UNSET;
+  protected float mLetterSpacingInput = Float.NaN;
   protected int mTextAlign = Gravity.NO_GRAVITY;
   protected int mTextBreakStrategy =
       (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ? 0 : Layout.BREAK_STRATEGY_HIGH_QUALITY;
@@ -281,6 +290,39 @@ private static int parseNumericFontWeight(String fontWeightString) {
   protected boolean mContainsImages = false;
   protected float mHeightOfTallestInlineImage = Float.NaN;
 
+  public ReactBaseTextShadowNode() {}
+
+  public ReactBaseTextShadowNode(ReactBaseTextShadowNode node) {
+    super(node);
+    mLineHeight = node.mLineHeight;
+    mIsColorSet = node.mIsColorSet;
+    mAllowFontScaling = node.mAllowFontScaling;
+    mColor = node.mColor;
+    mIsBackgroundColorSet = node.mIsBackgroundColorSet;
+    mBackgroundColor = node.mBackgroundColor;
+
+    mNumberOfLines = node.mNumberOfLines;
+    mFontSize = node.mFontSize;
+    mFontSizeInput = node.mFontSizeInput;
+    mLineHeightInput = node.mLineHeightInput;
+    mTextAlign = node.mTextAlign;
+    mTextBreakStrategy = node.mTextBreakStrategy;
+
+    mTextShadowOffsetDx = node.mTextShadowOffsetDx;
+    mTextShadowOffsetDy = node.mTextShadowOffsetDy;
+    mTextShadowRadius = node.mTextShadowRadius;
+    mTextShadowColor = node.mTextShadowColor;
+
+    mIsUnderlineTextDecorationSet = node.mIsUnderlineTextDecorationSet;
+    mIsLineThroughTextDecorationSet = node.mIsLineThroughTextDecorationSet;
+    mIncludeFontPadding = node.mIncludeFontPadding;
+    mFontStyle = node.mFontStyle;
+    mFontWeight = node.mFontWeight;
+    mFontFamily = node.mFontFamily;
+    mContainsImages = node.mContainsImages;
+    mHeightOfTallestInlineImage = node.mHeightOfTallestInlineImage;
+  }
+
   // Returns a line height which takes into account the requested line height
   // and the height of the inline images.
   public float getEffectiveLineHeight() {
@@ -324,12 +366,22 @@ public void setLineHeight(float lineHeight) {
     markUpdated();
   }
 
+  @ReactProp(name = ViewProps.LETTER_SPACING, defaultFloat = Float.NaN)
+  public void setLetterSpacing(float letterSpacing) {
+    mLetterSpacingInput = letterSpacing;
+    mLetterSpacing = mAllowFontScaling
+      ? PixelUtil.toPixelFromSP(mLetterSpacingInput)
+      : PixelUtil.toPixelFromDIP(mLetterSpacingInput);
+    markUpdated();
+  }
+
   @ReactProp(name = ViewProps.ALLOW_FONT_SCALING, defaultBoolean = true)
   public void setAllowFontScaling(boolean allowFontScaling) {
     if (allowFontScaling != mAllowFontScaling) {
       mAllowFontScaling = allowFontScaling;
       setFontSize(mFontSizeInput);
       setLineHeight(mLineHeightInput);
+      setLetterSpacing(mLetterSpacingInput);
       markUpdated();
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
index 1e63a209492369..001cba18810f2b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
- * <p/>
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java
index 35bdf2a3c32600..ff994f98ce33e6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
index 6cf0200c746265..87f6d53692c59f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.text;
 
@@ -23,6 +22,18 @@ public class ReactRawTextShadowNode extends ReactShadowNodeImpl {
 
   private @Nullable String mText = null;
 
+  public ReactRawTextShadowNode() { }
+
+  private ReactRawTextShadowNode(ReactRawTextShadowNode node) {
+    super(node);
+    this.mText = node.mText;
+  }
+
+  @Override
+  public ReactShadowNodeImpl mutableCopy() {
+    return new ReactRawTextShadowNode(this);
+  }
+
   @ReactProp(name = PROP_TEXT)
   public void setText(@Nullable String text) {
     mText = text;
@@ -37,4 +48,9 @@ public void setText(@Nullable String text) {
   public boolean isVirtual() {
     return true;
   }
+
+  @Override
+  public String toString() {
+    return getViewClass() + " [text: " + mText + "]";
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java
index 9bdc7c03f61941..772adc7a9c0855 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
index 4782b70d73e913..71ba5eef46095f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
index 3f4b2b9363f6d3..637767cb8d5311 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
@@ -22,4 +20,11 @@ public abstract class ReactTextInlineImageShadowNode extends LayoutShadowNode {
    * place of this node.
    */
   public abstract TextInlineImageSpan buildInlineImageSpan();
+
+  public ReactTextInlineImageShadowNode() {}
+
+  protected ReactTextInlineImageShadowNode(ReactTextInlineImageShadowNode node) {
+    super(node);
+  }
+
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
index 6bd12cc697945d..72e044ee8b047a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
@@ -19,6 +17,7 @@
 import android.view.Gravity;
 import android.widget.TextView;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.UIViewOperationQueue;
 import com.facebook.yoga.YogaConstants;
@@ -139,11 +138,26 @@ public long measure(
       };
 
   public ReactTextShadowNode() {
+    initMeasureFunction();
+  }
+
+  private ReactTextShadowNode(ReactTextShadowNode node) {
+    super(node);
+    this.mPreparedSpannableText = node.mPreparedSpannableText;
+    initMeasureFunction();
+  }
+
+  private void initMeasureFunction() {
     if (!isVirtual()) {
       setMeasureFunction(mTextMeasureFunction);
     }
   }
 
+  @Override
+  public LayoutShadowNode mutableCopy() {
+    return new ReactTextShadowNode(this);
+  }
+
   // Return text alignment according to LTR or RTL style
   private int getTextAlign() {
     int textAlign = mTextAlign;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
index 9f67aec6180dee..964f92ed6a37dc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
index 41ca82f4cd4992..226a5d4e0f4686 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
index 2ade0ece3fd0cf..8b6578f38b9f9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java
index 734549aebb81cd..6506e9697abb4a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java
@@ -11,4 +11,15 @@ public class ReactVirtualTextShadowNode extends ReactBaseTextShadowNode {
   public boolean isVirtual() {
     return true;
   }
+
+  public ReactVirtualTextShadowNode() { }
+
+  private ReactVirtualTextShadowNode(ReactVirtualTextShadowNode node) {
+    super(node);
+  }
+
+  @Override
+  public ReactVirtualTextShadowNode mutableCopy() {
+    return new ReactVirtualTextShadowNode(this);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java
index 64753b8a7524c1..2df5718b5ad274 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java
index 9e030f838ca98a..2b2dd1fa94b4c2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java
index c987260fd0f380..db620cb6157cb6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
  package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
index d662c79c9382f0..56298de90205f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
@@ -1,14 +1,13 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text.frescosupport;
 
+import com.facebook.react.uimanager.LayoutShadowNode;
 import javax.annotation.Nullable;
 
 import java.util.Locale;
@@ -50,6 +49,21 @@ public FrescoBasedReactTextInlineImageShadowNode(
     mCallerContext = callerContext;
   }
 
+  private FrescoBasedReactTextInlineImageShadowNode(FrescoBasedReactTextInlineImageShadowNode node) {
+    super(node);
+    mHeaders = node.mHeaders; // mHeaders is immutable
+    mWidth = node.mWidth;
+    mHeight = node.mHeight;
+    mDraweeControllerBuilder = node.mDraweeControllerBuilder;
+    mCallerContext = node.mCallerContext;
+    mUri = node.mUri;
+  }
+
+  @Override
+  public FrescoBasedReactTextInlineImageShadowNode mutableCopy() {
+    return new FrescoBasedReactTextInlineImageShadowNode(this);
+  }
+
   @ReactProp(name = "src")
   public void setSource(@Nullable ReadableArray sources) {
     final String source =
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java
index 2293bc67472c52..da53a968703fa8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text.frescosupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java
index bf5ac353f3697b..ca1ee0baba1350 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text.frescosupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java
index fab6bbc1e34d1a..e02a8c9e0969b0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
index 2ad1a1c3a37315..e9cf4fffe7acae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index e1796270a09bf8..7a9f34e2a6a0dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
@@ -35,6 +33,7 @@
 import android.widget.EditText;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.views.text.CustomStyleSpan;
 import com.facebook.react.views.text.ReactTagSpan;
@@ -82,6 +81,7 @@ public class ReactEditText extends EditText {
   private @Nullable ScrollWatcher mScrollWatcher;
   private final InternalKeyListener mKeyListener;
   private boolean mDetectScrollMovement = false;
+  private float mLetterSpacingPt = 0;
 
   private ReactViewBackgroundManager mReactBackgroundManager;
 
@@ -174,14 +174,16 @@ protected void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert) {
   @Override
   public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
     ReactContext reactContext = (ReactContext) getContext();
-    ReactEditTextInputConnectionWrapper inputConnectionWrapper =
-        new ReactEditTextInputConnectionWrapper(super.onCreateInputConnection(outAttrs), reactContext, this);
+    InputConnection inputConnection = super.onCreateInputConnection(outAttrs);
+    if (inputConnection != null) {
+      inputConnection = new ReactEditTextInputConnectionWrapper(inputConnection, reactContext, this);
+    }
 
     if (isMultiline() && getBlurOnSubmit()) {
       // Remove IME_FLAG_NO_ENTER_ACTION to keep the original IME_OPTION
       outAttrs.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION;
     }
-    return inputConnectionWrapper;
+    return inputConnection;
   }
 
   @Override
@@ -627,6 +629,29 @@ public void setBorderStyle(@Nullable String style) {
     mReactBackgroundManager.setBorderStyle(style);
   }
 
+  public void setLetterSpacingPt(float letterSpacingPt) {
+    mLetterSpacingPt = letterSpacingPt;
+    updateLetterSpacing();
+  }
+
+  @Override
+  public void setTextSize (float size) {
+    super.setTextSize(size);
+    updateLetterSpacing();
+  }
+
+  @Override
+  public void setTextSize (int unit, float size) {
+    super.setTextSize(unit, size);
+    updateLetterSpacing();
+  }
+
+  protected void updateLetterSpacing() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      setLetterSpacing(PixelUtil.toPixelFromSP(mLetterSpacingPt) / getTextSize());
+    }
+  }
+
   /**
    * This class will redirect *TextChanged calls to the listeners only in the case where the text
    * is changed by the user, and not explicitly set by JS.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
index 5a06db595e2027..cc2976efdf8679 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
@@ -94,14 +92,15 @@ public boolean setComposingText(CharSequence text, int newCursorPosition) {
     int previousSelectionEnd = mEditText.getSelectionEnd();
     String key;
     boolean consumed = super.setComposingText(text, newCursorPosition);
+    int currentSelectionStart = mEditText.getSelectionStart();
     boolean noPreviousSelection = previousSelectionStart == previousSelectionEnd;
-    boolean cursorDidNotMove = mEditText.getSelectionStart() == previousSelectionStart;
-    boolean cursorMovedBackwards = mEditText.getSelectionStart() < previousSelectionStart;
-    if ((noPreviousSelection && cursorMovedBackwards)
-            || !noPreviousSelection && cursorDidNotMove) {
+    boolean cursorDidNotMove = currentSelectionStart == previousSelectionStart;
+    boolean cursorMovedBackwardsOrAtBeginningOfInput =
+        (currentSelectionStart < previousSelectionStart) || currentSelectionStart <= 0;
+    if (cursorMovedBackwardsOrAtBeginningOfInput || (!noPreviousSelection && cursorDidNotMove)) {
       key = BACKSPACE_KEY_VALUE;
     } else {
-      key = String.valueOf(mEditText.getText().charAt(mEditText.getSelectionStart() - 1));
+      key = String.valueOf(mEditText.getText().charAt(currentSelectionStart - 1));
     }
     dispatchKeyEventOrEnqueue(key);
     return consumed;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
index 7b9f2829b12ae9..7ecb6ef86d50a4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
index a51d01677e8107..bb15cc6ed47fa3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
index 9c6975cf7a9869..812bea17461d6d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
index caab8c136c0eb4..2df3a8380a91db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
index 3ca67c3d944008..883069b0e97e6d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
index 7771a1d0e1d83c..f3530d0e3df53e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java
index f12cf8832c531f..3940e4f7c62043 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index b4904a9e3b172e..637027140ec010 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
@@ -308,6 +306,14 @@ public void setOnScroll(final ReactEditText view, boolean onScroll) {
     }
   }
 
+  // Sets the letter spacing as an absolute point size.
+  // This extra handling, on top of what ReactBaseTextShadowNode already does, is required for the
+  // correct display of spacing in placeholder (hint) text.
+  @ReactProp(name = ViewProps.LETTER_SPACING, defaultFloat = 0)
+  public void setLetterSpacing(ReactEditText view, float letterSpacing) {
+    view.setLetterSpacingPt(letterSpacing);
+  }
+
   @ReactProp(name = "placeholder")
   public void setPlaceholder(ReactEditText view, @Nullable String placeholder) {
     view.setHint(placeholder);
@@ -372,6 +378,16 @@ public void setCaretHidden(ReactEditText view, boolean caretHidden) {
     view.setCursorVisible(!caretHidden);
   }
 
+  @ReactProp(name = "contextMenuHidden", defaultBoolean = false)
+  public void setContextMenuHidden(ReactEditText view, boolean contextMenuHidden) {
+    final boolean _contextMenuHidden = contextMenuHidden;
+    view.setOnLongClickListener(new View.OnLongClickListener() {
+      public boolean onLongClick(View v) {
+        return _contextMenuHidden;
+      };
+    });
+  }
+
   @ReactProp(name = "selectTextOnFocus", defaultBoolean = false)
   public void setSelectTextOnFocus(ReactEditText view, boolean selectTextOnFocus) {
     view.setSelectAllOnFocus(selectTextOnFocus);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
index c9e5a4153715ef..f34e342a518fd4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
index 3fac6104ec0422..375c02a6285711 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
@@ -16,6 +14,7 @@
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIViewOperationQueue;
@@ -49,6 +48,23 @@ public ReactTextInputShadowNode() {
     setMeasureFunction(this);
   }
 
+  private ReactTextInputShadowNode(ReactTextInputShadowNode node) {
+    super(node);
+    mMostRecentEventCount = node.mMostRecentEventCount;
+    mText = node.mText;
+    mLocalData = node.mLocalData;
+    setMeasureFunction(this);
+    ThemedReactContext themedContext = getThemedContext();
+    if (themedContext != null) {
+      setThemedContext(themedContext);
+    }
+  }
+
+  @Override
+  public ReactTextInputShadowNode mutableCopy() {
+    return new ReactTextInputShadowNode(this);
+  }
+
   @Override
   public void setThemedContext(ThemedReactContext themedContext) {
     super.setThemedContext(themedContext);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
index 32b9755a0129d3..e0819785034b60 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java
index ec2ac41c56e074..079d8555428d09 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java
index f569067ab91687..0ac6d0e5cbfcdb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
index 8b92242914c90b..7d8a5f5dadcf88 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.toolbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
index 57d8c6d0d0fc5b..e0526dc159f898 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.toolbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
index 6521544d53321a..be9377047a90c8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.toolbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java
index ecbf31dac3b27a..6b88f2dee676a0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.toolbar.events;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java
index a8efbd777d0d40..1e57cc8e793ad1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
index a4dda0d9d3d89a..2675c10d2790a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
index 4990dd4236a893..9e374b4c502ecb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
index 4ab4e9119cc222..3641d120dab333 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
index 0ca79f814e07fe..b4eb587049bd9e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
@@ -58,8 +56,16 @@ public void setAccessible(ReactViewGroup view, boolean accessible) {
     view.setFocusable(accessible);
   }
 
-  @ReactPropGroup(
-    names = {
+  @ReactProp(name = "hasTVPreferredFocus")
+  public void setTVPreferredFocus(ReactViewGroup view, boolean hasTVPreferredFocus) {
+    if (hasTVPreferredFocus) {
+      view.setFocusable(true);
+      view.setFocusableInTouchMode(true);
+      view.requestFocus();
+    }
+  }
+
+  @ReactPropGroup(names = {
       ViewProps.BORDER_RADIUS,
       ViewProps.BORDER_TOP_LEFT_RADIUS,
       ViewProps.BORDER_TOP_RIGHT_RADIUS,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java
index 6eeac56d747ba1..2d4dc97c884fa0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.viewpager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java
index d3a5a7c4a10302..49ba9f322d8f8c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.viewpager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java
index 6145c08230bcc2..773c31bedbeea8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.viewpager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
index 9a76bace545907..48b5f1a6194956 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
@@ -1,20 +1,20 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.viewpager;
 
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.NativeGestureUtil;
@@ -176,10 +176,18 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
       return false;
     }
 
-    if (super.onInterceptTouchEvent(ev)) {
-      NativeGestureUtil.notifyNativeGestureStarted(this, ev);
-      return true;
+    try {
+      if (super.onInterceptTouchEvent(ev)) {
+        NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+        return true;
+      }
+    } catch (IllegalArgumentException e) {
+      // Log and ignore the error. This seems to be a bug in the android SDK and
+      // this is the commonly accepted workaround.
+      // https://tinyurl.com/mw6qkod (Stack Overflow)
+      Log.w(ReactConstants.TAG, "Error intercepting touch event.", e);
     }
+
     return false;
   }
 
@@ -202,6 +210,26 @@ public void setScrollEnabled(boolean scrollEnabled) {
     mScrollEnabled = scrollEnabled;
   }
 
+
+  @Override
+  protected void onAttachedToWindow() {
+    super.onAttachedToWindow();
+    // The viewpager reset an internal flag on this method so we need to run another layout pass
+    // after attaching to window.
+    this.requestLayout();
+    post(measureAndLayout);
+  }
+
+  private final Runnable measureAndLayout = new Runnable() {
+    @Override
+    public void run() {
+      measure(
+              MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),
+              MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.EXACTLY));
+      layout(getLeft(), getTop(), getRight(), getBottom());
+    }
+  };
+
   /*package*/ void addViewToAdapter(View child, int index) {
     getAdapter().addView(child, index);
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java
index f211b7b04bfe6d..65d676ac91591e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.viewpager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
index 05b6740ad66b0b..3097beea5aadd6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java
index 7b2f1241efadbd..9e6d594ccd30a4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java
index 795b29f69a4533..02336a418eb74c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java
index e858fbc176dff9..088a512606757d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java
index 171cf6e6515712..154415d5eaa690 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java
index db5a4200d7fd6e..75c26a9346d922 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java b/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
index bea7a86825d7aa..c3576f0b49c20a 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.systrace;
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java b/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
index 3a255eb940047b..03dec5938b9318 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.systrace;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
index deb45f1d8d6cf5..bea5aebda8ea88 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java
index c0984012347b95..9ec41e7eae440a 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
index dfb559f27edb81..e68c512140f015 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
@@ -18,11 +16,16 @@ public class YogaConfig {
   public static int SPACING_TYPE = 1;
 
   static {
-    SoLoader.loadLibrary("yoga");
+    if (YogaConstants.shouldUseFastMath) {
+      SoLoader.loadLibrary("yogafastmath");
+    } else {
+      SoLoader.loadLibrary("yoga");
+    }
   }
 
   long mNativePointer;
   private YogaLogger mLogger;
+  private YogaNodeClonedFunction mNodeClonedFunction;
 
   private native long jni_YGConfigNew();
   public YogaConfig() {
@@ -80,4 +83,17 @@ public void setLogger(YogaLogger logger) {
   public YogaLogger getLogger() {
     return mLogger;
   }
+
+  private native void jni_YGConfigSetHasNodeClonedFunc(long nativePointer, boolean hasClonedFunc);
+
+  public void setOnNodeCloned(YogaNodeClonedFunction nodeClonedFunction) {
+    mNodeClonedFunction = nodeClonedFunction;
+    jni_YGConfigSetHasNodeClonedFunc(mNativePointer, nodeClonedFunction != null);
+  }
+
+  @DoNotStrip
+  public final void onNodeCloned(
+      YogaNode oldNode, YogaNode newNode, YogaNode parent, int childIndex) {
+    mNodeClonedFunction.onNodeCloned(oldNode, newNode, parent, childIndex);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
index 43f78139c45420..f235cfdeef6a7c 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
@@ -1,20 +1,37 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
 
 public class YogaConstants {
 
-  public static final float UNDEFINED = Float.NaN;
+  /**
+   * Large positive number signifies that the property(float) is undefined. Earlier we used to have
+   * YGundefined as NAN, but the downside of this is that we can't use -ffast-math compiler flag as
+   * it assumes all floating-point calculation involve and result into finite numbers. For more
+   * information regarding -ffast-math compiler flag in clang, have a look at
+   * https://clang.llvm.org/docs/UsersManual.html#cmdoption-ffast-math
+   */
+  public static final float UNDEFINED = (float) (10E20);
+
+  public static boolean shouldUseFastMath = false;
 
   public static boolean isUndefined(float value) {
-    return Float.compare(value, UNDEFINED) == 0;
+    // Value of a float in the case of it being not defined is 10.1E20. Earlier it used to be NAN,
+    // the benefit of which
+    // was that if NAN is involved in any mathematical expression the result was NAN. But since we
+    // want to have `-ffast-math`
+    // flag being used by compiler which assumes that the floating point values are not NAN and Inf,
+    // we represent YGUndefined as 10.1E20.
+    // But now if YGUndefined is involved in any mathematical operations this value(10.1E20) would
+    // change.
+    // So the following check makes sure that if the value is outside a range (-10E8, 10E8) then it
+    // is undefined.
+    return (Float.compare(value, (float) 10E8) >= 0 || Float.compare(value, (float) -10E8) <= 0);
   }
 
   public static boolean isUndefined(YogaValue value) {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
index b6cb1f84759973..b0d89226d28665 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
index 29789fcb08b173..dd6444e12ea792 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
index b7d416ec287f5e..e6e52aadef9acb 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
index 53677cff22bb7a..053490dabfb014 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
index 02dad1ed6bc9dd..a8a4be1432a514 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
index 19bdd20420d0f3..cf192d6c07ac31 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
index 283e0b57399897..9e15dc4a95286d 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
index d16d98f4be4d54..458e1b950ebb88 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java
index b27597bc531c73..66f62c89d7172a 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java
index cf32f1fadee940..2d2b304d3f967d 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
index 42633fa29a6bc0..9719377630fa85 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java
index b127c132e62951..1d2141d12a05ac 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index 093d209d34c6aa..df5fae91712879 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
@@ -16,10 +14,14 @@
 import javax.annotation.Nullable;
 
 @DoNotStrip
-public class YogaNode {
+public class YogaNode implements Cloneable {
 
   static {
-    SoLoader.loadLibrary("yoga");
+    if (YogaConstants.shouldUseFastMath) {
+      SoLoader.loadLibrary("yogafastmath");
+    } else {
+      SoLoader.loadLibrary("yoga");
+    }
   }
 
   /**
@@ -31,7 +33,7 @@ public class YogaNode {
   private List<YogaNode> mChildren;
   private YogaMeasureFunction mMeasureFunction;
   private YogaBaselineFunction mBaselineFunction;
-  private final long mNativePointer;
+  private long mNativePointer;
   private Object mData;
 
   /* Those flags needs be in sync with YGJNI.cpp */
@@ -160,6 +162,18 @@ public void addChildAt(YogaNode child, int i) {
     jni_YGNodeInsertChild(mNativePointer, child.mNativePointer, i);
   }
 
+  private native long jni_YGNodeClone(long nativePointer, Object newNode);
+
+  @Override
+  public YogaNode clone() throws CloneNotSupportedException {
+    YogaNode clonedYogaNode = (YogaNode) super.clone();
+    long clonedNativePointer = jni_YGNodeClone(mNativePointer, clonedYogaNode);
+    clonedYogaNode.mNativePointer = clonedNativePointer;
+    clonedYogaNode.mChildren =
+        mChildren != null ? (List<YogaNode>) ((ArrayList) mChildren).clone() : null;
+    return clonedYogaNode;
+  }
+
   private native void jni_YGNodeRemoveChild(long nativePointer, long childPointer);
   public YogaNode removeChildAt(int i) {
 
@@ -638,11 +652,11 @@ public final long measure(float width, int widthMode, float height, int heightMo
     }
 
     return mMeasureFunction.measure(
-          this,
-          width,
-          YogaMeasureMode.fromInt(widthMode),
-          height,
-          YogaMeasureMode.fromInt(heightMode));
+        this,
+        width,
+        YogaMeasureMode.fromInt(widthMode),
+        height,
+        YogaMeasureMode.fromInt(heightMode));
   }
 
   private native void jni_YGNodeSetHasBaselineFunc(long nativePointer, boolean hasMeasureFunc);
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java
new file mode 100644
index 00000000000000..f469546495f855
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2017-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.yoga;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public interface YogaNodeClonedFunction {
+
+  @DoNotStrip
+  void onNodeCloned(YogaNode oldNode, YogaNode newNode, YogaNode parent, int childIndex);
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
index 1b565ea1901bfe..fb767b0587eee8 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
index 510f0af43f370f..9563d3036410ee 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
index bbaeba38f249b7..be42a999231a93 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
index 58e2dc95e04783..5a804adf4552c4 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
index 8a08b0e5c39b6a..8eb2b31680a534 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java
index ae9bd05fc9b860..a99d564189058b 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
index a19d3de3baff44..1eaa9f7ad6f220 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/jni/first-party/fb/assert.cpp b/ReactAndroid/src/main/jni/first-party/fb/assert.cpp
index db9a43159978bc..d39c29e45cc176 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/assert.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/assert.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdarg>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h
index 0ed1c5fd6ab8f8..5f231cb7c8f20f 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /** @file ALog.h
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h
index 1e402a3fcb2345..1fafba36ae85e9 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h
index 34864fc328f898..319e96ecb08628 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h
index 36f7737f643684..92b45406f3c471 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
index d21fe697ea5adc..ee19960fa3547d 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
index 6d943972a61f94..c5ecc2fedce515 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h
index d86a2f0deac66d..1b868c44fe61dc 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h
index 1ff0740ace2e34..ea0c3f65edb258 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #ifndef FBASSERT_H
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h
index 66944c1caae8f3..e67aa1641313bb 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h
index c816924c5fceb8..595bfacfe6d108 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h
index 26ae3589aa676d..21d17a27ad8e33 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h
index 9da51c406e989f..a7775db6d2efb7 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /** @file Common.h
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h
index 8630aa6bf49d80..726a25333f0ced 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h
index 9149df24e8d140..147f885684af3d 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h
index 76eecb87b1c176..abfe45ce0d0514 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h
index b1089139d50900..689b9be3463ac0 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h
index 29fc9850a95ce2..74c752a0785ec7 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h
index e2cac448fd7aa4..7ca5016a80dc67 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h
index 206d2b4b17a577..c056e16af15695 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h
index aa3652666e7da2..0da2c36237d0bb 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h
index 60b3cac20ab56b..1bb61199fbf0a9 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h
index ff08aff4607520..60dfee44d34ff2 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h
index 05ecd237e89e9f..ad44470a86fb06 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h
index 4aefb0ca1825ed..e9717bf7fd8bb3 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /** @file meta.h
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h
index 68da6a25fb4c7d..0502e36b5a1139 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h
index cd1be640d0d294..b78f66040230dd 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h
index 024ba797ff2905..a971263ad0d9c2 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h
index 8dabf67cb62e60..58ce511d50e56e 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h
index 74a01e1843e8f0..fc6c689ea40b77 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h
index 796b8029677161..39cc71a2498c6d 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h
index 33da549c337cb7..ce0636e014747b 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h
index ecead9fff87903..cae1ab48b82376 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h
index 26472669dc7184..36c8bec15dae27 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h
index 7212cc4d0896a7..5dbc03126ad1c9 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h
index 37f006a498d1d2..41152f5d171ede 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h
index 7011a06bc6daa1..6c14b50c159b7f 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h
index 24f27c692a2c10..ae59441babdb1a 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h
index f0faf5fb884169..20c275e2de2ca6 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h
index 843f988d2c0268..509405b31a8b22 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h
index 22a558dc76add9..531f26ef8efc73 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h
index 5ed89a1b1aa899..9d07ef6441cff8 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h
index 243a947889d710..8b91cba35e2061 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h
index d8d59f9b7e4506..898f91e9eb804c 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h
index 808593ab3499a6..93912f4a0a59a0 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp
index 2e839ecf432a2c..5a5317f9f2b15c 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/fbjni/ByteBuffer.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp
index 0d7c388f53f6a6..ee958bf57157ee 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp
index 48060107e2bc6c..eae5c73ebc8be8 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/log.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp
index 3dca10b76a7541..783f468c4de3f9 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/fbjni/CoreClasses.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp
index 9d7cdcbf16f6e6..dfcf858fd16da5 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "fb/fbjni.h"
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp
index 7e60d2642300c4..7679d09404b825 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <jni/LocalString.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp
index 0334729c8e20b6..228621cbd90f43 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <jni/Countable.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp
index 0ef4b0d6d0525e..37160cdd1bb1e4 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/fbjni/References.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp
index 1fd4e50ac2c06b..dfaa02f6c76fd2 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/Environment.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp
index 9893db41d3a97b..7d3fc5716d12bd 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #ifndef __ANDROID__
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp
index e595ea90f6495c..b455ad845199a3 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/fbjni.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java
index a0c845dd62878a..6308d5dc269310 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java
index 13090a18ce30a3..942a617148a629 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java b/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java
index 45e9bfe0cee0dd..902159d9fcdf99 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp
index 8bf7c3542770a4..b6ad635450cdf1 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <jni.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/log.cpp b/ReactAndroid/src/main/jni/first-party/fb/log.cpp
index b58b7ac9452a03..b6baa2dad22b67 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/log.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/log.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/log.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/onload.cpp b/ReactAndroid/src/main/jni/first-party/fb/onload.cpp
index 2caebc37a4eb38..0594526d38167a 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/onload.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/onload.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <jni.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
index 6309cea5c405c7..fc54ae9909d289 100644
--- a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
@@ -5,6 +5,7 @@ cxx_library(
     srcs = [
         "glog_init.cpp",
     ],
+    header_namespace = "",
     exported_headers = ["fb/glog_init.h"],
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
index 254602fbc56c70..79f4fce30259ce 100644
--- a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
@@ -1,11 +1,9 @@
 load("//ReactNative:DEFS.bzl", "cxx_library")
 
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 cxx_library(
     name = "jni-hack",
diff --git a/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h b/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h
index d768a112771533..166908733ef313 100644
--- a/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h
+++ b/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index a54c062fd1ad87..46d73b44b4d7ff 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/fbjni.h>
@@ -19,6 +17,22 @@ struct JYogaNode : public JavaClass<JYogaNode> {
   static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaNode;";
 };
 
+struct JYogaConfig : public JavaClass<JYogaConfig> {
+  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaConfig;";
+};
+
+struct YGConfigContext {
+  global_ref<jobject>* logger;
+  global_ref<jobject>* config;
+  YGConfigContext() : logger(nullptr), config(nullptr) {}
+  ~YGConfigContext() {
+    delete config;
+    config = nullptr;
+    delete logger;
+    logger = nullptr;
+  }
+};
+
 static inline weak_ref<JYogaNode> *YGNodeJobject(YGNodeRef node) {
   return reinterpret_cast<weak_ref<JYogaNode>*>(node->getContext());
 }
@@ -118,11 +132,39 @@ static float YGJNIBaselineFunc(YGNodeRef node, float width, float height) {
   }
 }
 
-static YGSize YGJNIMeasureFunc(YGNodeRef node,
-                               float width,
-                               YGMeasureMode widthMode,
-                               float height,
-                               YGMeasureMode heightMode) {
+static void YGJNIOnNodeClonedFunc(
+    YGNodeRef oldNode,
+    YGNodeRef newNode,
+    YGNodeRef parent,
+    int childIndex) {
+  auto config = oldNode->getConfig();
+  if (!config) {
+    return;
+  }
+  static auto onNodeClonedFunc = findClassStatic("com/facebook/yoga/YogaConfig")
+                                     ->getMethod<void(
+                                         local_ref<JYogaNode>,
+                                         local_ref<JYogaNode>,
+                                         local_ref<JYogaNode>,
+                                         jint)>("onNodeCloned");
+
+  auto context = reinterpret_cast<YGConfigContext*>(YGConfigGetContext(config));
+  auto javaConfig = context->config;
+
+  onNodeClonedFunc(
+      javaConfig->get(),
+      YGNodeJobject(oldNode)->lockLocal(),
+      YGNodeJobject(newNode)->lockLocal(),
+      YGNodeJobject(parent)->lockLocal(),
+      childIndex);
+}
+
+static YGSize YGJNIMeasureFunc(
+    YGNodeRef node,
+    float width,
+    YGMeasureMode widthMode,
+    float height,
+    YGMeasureMode heightMode) {
   if (auto obj = YGNodeJobject(node)->lockLocal()) {
     static auto measureFunc = findClassStatic("com/facebook/yoga/YogaNode")
                                   ->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure");
@@ -206,6 +248,16 @@ jlong jni_YGNodeNewWithConfig(alias_ref<jobject> thiz, jlong configPointer) {
   return reinterpret_cast<jlong>(node);
 }
 
+jlong jni_YGNodeClone(
+    alias_ref<jobject> thiz,
+    jlong nativePointer,
+    alias_ref<jobject> clonedJavaObject) {
+  const YGNodeRef clonedYogaNode = YGNodeClone(_jlong2YGNodeRef(nativePointer));
+  clonedYogaNode->setContext(
+      new weak_ref<jobject>(make_weak(clonedJavaObject)));
+  return reinterpret_cast<jlong>(clonedYogaNode);
+}
+
 void jni_YGNodeFree(alias_ref<jobject> thiz, jlong nativePointer) {
   const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
   delete YGNodeJobject(node);
@@ -285,13 +337,15 @@ struct JYogaValue : public JavaClass<JYogaValue> {
   }
 };
 
-#define YG_NODE_JNI_STYLE_PROP(javatype, type, name)                                       \
-  javatype jni_YGNodeStyleGet##name(alias_ref<jobject>, jlong nativePointer) {             \
-    return (javatype) YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer));               \
-  }                                                                                        \
-                                                                                           \
-  void jni_YGNodeStyleSet##name(alias_ref<jobject>, jlong nativePointer, javatype value) { \
-    YGNodeStyleSet##name(_jlong2YGNodeRef(nativePointer), static_cast<type>(value));       \
+#define YG_NODE_JNI_STYLE_PROP(javatype, type, name)                           \
+  javatype jni_YGNodeStyleGet##name(alias_ref<jobject>, jlong nativePointer) { \
+    return (javatype)YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer));    \
+  }                                                                            \
+                                                                               \
+  void jni_YGNodeStyleSet##name(                                               \
+      alias_ref<jobject>, jlong nativePointer, javatype value) {               \
+    YGNodeStyleSet##name(                                                      \
+        _jlong2YGNodeRef(nativePointer), static_cast<type>(value));            \
   }
 
 #define YG_NODE_JNI_STYLE_UNIT_PROP(name)                                                         \
@@ -396,6 +450,10 @@ jlong jni_YGConfigNew(alias_ref<jobject>) {
 
 void jni_YGConfigFree(alias_ref<jobject>, jlong nativePointer) {
   const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
+  auto context = reinterpret_cast<YGConfigContext*>(YGConfigGetContext(config));
+  if (context) {
+    delete context;
+  }
   YGConfigFree(config);
 }
 
@@ -430,19 +488,48 @@ void jni_YGConfigSetUseLegacyStretchBehaviour(alias_ref<jobject>,
   YGConfigSetUseLegacyStretchBehaviour(config, useLegacyStretchBehaviour);
 }
 
-void jni_YGConfigSetLogger(alias_ref<jobject>, jlong nativePointer, alias_ref<jobject> logger) {
+void jni_YGConfigSetHasNodeClonedFunc(
+    alias_ref<jobject> thiz,
+    jlong nativePointer,
+    jboolean hasNodeClonedFunc) {
   const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
+  auto context = reinterpret_cast<YGConfigContext*>(YGConfigGetContext(config));
+  if (context && context->config) {
+    delete context->config;
+    context->config = nullptr;
+  }
 
-  auto context = YGConfigGetContext(config);
-  if (context) {
-    delete reinterpret_cast<global_ref<jobject> *>(context);
+  if (hasNodeClonedFunc) {
+    if (!context) {
+      context = new YGConfigContext();
+      YGConfigSetContext(config, context);
+    }
+    context->config = new global_ref<jobject>(make_global(thiz));
+    YGConfigSetNodeClonedFunc(config, YGJNIOnNodeClonedFunc);
+  } else {
+    YGConfigSetNodeClonedFunc(config, nullptr);
+  }
+}
+
+void jni_YGConfigSetLogger(
+    alias_ref<jobject>,
+    jlong nativePointer,
+    alias_ref<jobject> logger) {
+  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
+  auto context = reinterpret_cast<YGConfigContext*>(YGConfigGetContext(config));
+  if (context && context->logger) {
+    delete context->logger;
+    context->logger = nullptr;
   }
 
   if (logger) {
-    YGConfigSetContext(config, new global_ref<jobject>(make_global(logger)));
+    if (!context) {
+      context = new YGConfigContext();
+      YGConfigSetContext(config, context);
+    }
+    context->logger = new global_ref<jobject>(make_global(logger));
     YGConfigSetLogger(config, YGJNILogFunc);
   } else {
-    YGConfigSetContext(config, NULL);
     YGConfigSetLogger(config, NULL);
   }
 }
@@ -535,6 +622,7 @@ jint JNI_OnLoad(JavaVM *vm, void *) {
             YGMakeNativeMethod(jni_YGNodeStyleSetAspectRatio),
             YGMakeNativeMethod(jni_YGNodeGetInstanceCount),
             YGMakeNativeMethod(jni_YGNodePrint),
+            YGMakeNativeMethod(jni_YGNodeClone),
         });
     registerNatives("com/facebook/yoga/YogaConfig",
                     {
@@ -545,6 +633,7 @@ jint JNI_OnLoad(JavaVM *vm, void *) {
                         YGMakeNativeMethod(jni_YGConfigSetPointScaleFactor),
                         YGMakeNativeMethod(jni_YGConfigSetUseLegacyStretchBehaviour),
                         YGMakeNativeMethod(jni_YGConfigSetLogger),
+                        YGMakeNativeMethod(jni_YGConfigSetHasNodeClonedFunc),
                     });
   });
 }
diff --git a/ReactAndroid/src/main/jni/packagerconnection/BUCK b/ReactAndroid/src/main/jni/packagerconnection/BUCK
index b1095f42d35021..caede999292be2 100644
--- a/ReactAndroid/src/main/jni/packagerconnection/BUCK
+++ b/ReactAndroid/src/main/jni/packagerconnection/BUCK
@@ -1,6 +1,6 @@
-load("//ReactNative:DEFS.bzl", "cxx_library", "FBJNI_TARGET", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "IS_OSS_BUILD", "react_native_xplat_target")
+load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library", "FBJNI_TARGET", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "ANDROID", "IS_OSS_BUILD", "react_native_xplat_target")
 
-cxx_library(
+rn_xplat_cxx_library(
     name = "jni",
     srcs = glob(["*.cpp"]),
     headers = glob(
@@ -16,6 +16,7 @@ cxx_library(
     ],
     fbandroid_deps = ANDROID_JSC_DEPS,
     fbobjc_deps = APPLE_JSC_DEPS,
+    platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"PackagerConnectionJNI\"",
         "-DWITH_FBSYSTRACE=1",
diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK
index a33e775d459d3d..7673ad3bdfd348 100644
--- a/ReactAndroid/src/main/jni/react/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/jni/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "cxx_library", "react_native_xplat_target", "FBJNI_TARGET", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "IS_OSS_BUILD")
+load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library", "react_native_xplat_target", "FBJNI_TARGET", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "ANDROID", "IS_OSS_BUILD")
 
 EXPORTED_HEADERS = [
     "AndroidJSCFactory.h",
@@ -20,7 +20,7 @@ EXPORTED_HEADERS = [
     "WritableNativeMap.h",
 ]
 
-cxx_library(
+rn_xplat_cxx_library(
     name = "jni",
     srcs = glob(["*.cpp"]),
     headers = glob(
@@ -41,6 +41,7 @@ cxx_library(
     fbandroid_allow_jni_merging = True,
     fbandroid_deps = ANDROID_JSC_DEPS,
     fbobjc_deps = APPLE_JSC_DEPS,
+    platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNativeJNI\"",
         "-DWITH_FBSYSTRACE=1",
diff --git a/ReactAndroid/src/main/jni/react/jni/JInspector.cpp b/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
index 8e64ce1ad20ffd..47000279487ed7 100644
--- a/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
@@ -28,9 +28,9 @@ class RemoteConnection : public IRemoteConnection {
 
 }
 
-jni::local_ref<JPage::javaobject> JPage::create(int id, const std::string& title) {
-  static auto constructor = javaClassStatic()->getConstructor<JPage::javaobject(jint, jni::local_ref<jni::JString>)>();
-  return javaClassStatic()->newObject(constructor, id, jni::make_jstring(title));
+jni::local_ref<JPage::javaobject> JPage::create(int id, const std::string& title, const std::string& vm) {
+  static auto constructor = javaClassStatic()->getConstructor<JPage::javaobject(jint, jni::local_ref<jni::JString>, jni::local_ref<jni::JString>)>();
+  return javaClassStatic()->newObject(constructor, id, jni::make_jstring(title), jni::make_jstring(vm));
 }
 
 void JRemoteConnection::onMessage(const std::string& message) const {
@@ -70,7 +70,7 @@ jni::local_ref<jni::JArrayClass<JPage::javaobject>> JInspector::getPages() {
   std::vector<InspectorPage> pages = inspector_->getPages();
   auto array = jni::JArrayClass<JPage::javaobject>::newArray(pages.size());
   for (size_t i = 0; i < pages.size(); i++) {
-    (*array)[i] = JPage::create(pages[i].id, pages[i].title);
+    (*array)[i] = JPage::create(pages[i].id, pages[i].title, pages[i].vm);
   }
   return array;
 }
diff --git a/ReactAndroid/src/main/jni/react/jni/JInspector.h b/ReactAndroid/src/main/jni/react/jni/JInspector.h
index c170fe59dd2e11..9e089687eb87e4 100644
--- a/ReactAndroid/src/main/jni/react/jni/JInspector.h
+++ b/ReactAndroid/src/main/jni/react/jni/JInspector.h
@@ -16,7 +16,7 @@ class JPage : public jni::JavaClass<JPage> {
 public:
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/Inspector$Page;";
 
-  static jni::local_ref<JPage::javaobject> create(int id, const std::string& title);
+  static jni::local_ref<JPage::javaobject> create(int id, const std::string& title, const std::string& vm);
 };
 
 class JRemoteConnection : public jni::JavaClass<JRemoteConnection> {
diff --git a/ReactAndroid/src/main/jni/react/perftests/BUCK b/ReactAndroid/src/main/jni/react/perftests/BUCK
index 4a9c42a4ee1a0e..6baeaf89834a06 100644
--- a/ReactAndroid/src/main/jni/react/perftests/BUCK
+++ b/ReactAndroid/src/main/jni/react/perftests/BUCK
@@ -1,12 +1,13 @@
-load("//ReactNative:DEFS.bzl", "cxx_library", "react_native_xplat_target")
+load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library", "react_native_xplat_target", "ANDROID")
 
-cxx_library(
+rn_xplat_cxx_library(
     name = "perftests",
     srcs = ["OnLoad.cpp"],
     compiler_flags = [
         "-fexceptions",
         "-std=c++1y",
     ],
+    platforms = ANDROID,
     soname = "libnativereactperftests.$(ext)",
     visibility = [
         "fbandroid//instrumentation_tests/com/facebook/react/...",
diff --git a/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java b/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java
index 80ebb0cee82897..baf9b9913b8bc8 100644
--- a/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java
+++ b/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.common.logging;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java b/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java
index d6eb5332797420..f12b8b178c168e 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
index 3bcdab6acdd5cb..c293858b4b6ade 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
index 6f244c70be4baf..3c31cb1cf00c12 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
@@ -171,11 +169,6 @@ public void testFramesAnimation() {
     ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
         ArgumentCaptor.forClass(ReactStylesDiffMap.class);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(0);
-
     for (int i = 0; i < frames.size(); i++) {
       reset(mUIImplementationMock);
       mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
@@ -205,11 +198,6 @@ public void testFramesAnimationLoopsFiveTimes() {
     ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
         ArgumentCaptor.forClass(ReactStylesDiffMap.class);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(0);
-
     for (int iteration = 0; iteration < 5; iteration++) {
       for (int i = 0; i < frames.size(); i++) {
         reset(mUIImplementationMock);
@@ -270,9 +258,6 @@ public void testNodeValueListenerIfListening() {
       JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1d),
       animationCallback);
 
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(valueListener).onValueUpdate(eq(0d));
-
     for (int i = 0; i < frames.size(); i++) {
       reset(valueListener);
       mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
@@ -600,7 +585,6 @@ public void testAnimationCallbackFinish() {
 
     reset(animationCallback);
     mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
     verifyNoMoreInteractions(animationCallback);
 
     reset(animationCallback);
@@ -629,10 +613,10 @@ private void createAnimatedGraphWithAdditionNode(
       double secondValue) {
     mNativeAnimatedNodesManager.createAnimatedNode(
       1,
-      JavaOnlyMap.of("type", "value", "value", 100d, "offset", 0d));
+      JavaOnlyMap.of("type", "value", "value", firstValue, "offset", 0d));
     mNativeAnimatedNodesManager.createAnimatedNode(
       2,
-      JavaOnlyMap.of("type", "value", "value", 1000d, "offset", 0d));
+      JavaOnlyMap.of("type", "value", "value", secondValue, "offset", 0d));
 
     mNativeAnimatedNodesManager.createAnimatedNode(
       3,
@@ -648,7 +632,7 @@ private void createAnimatedGraphWithAdditionNode(
     mNativeAnimatedNodesManager.connectAnimatedNodes(2, 3);
     mNativeAnimatedNodesManager.connectAnimatedNodes(3, 4);
     mNativeAnimatedNodesManager.connectAnimatedNodes(4, 5);
-    mNativeAnimatedNodesManager.connectAnimatedNodeToView(5, 50);
+    mNativeAnimatedNodesManager.connectAnimatedNodeToView(5, viewTag);
   }
 
   @Test
@@ -677,12 +661,6 @@ public void testAdditionNode() {
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
     assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock)
-      .synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
-
     reset(mUIImplementationMock);
     mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
     verify(mUIImplementationMock)
@@ -722,12 +700,6 @@ public void testViewReceiveUpdatesIfOneOfAnimationHasntStarted() {
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
     assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock)
-      .synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
-
     reset(mUIImplementationMock);
     mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
     verify(mUIImplementationMock)
@@ -777,11 +749,6 @@ public void testViewReceiveUpdatesWhenOneOfAnimationHasFinished() {
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
     assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
-
     for (int i = 1; i < secondFrames.size(); i++) {
       reset(mUIImplementationMock);
       mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
@@ -843,11 +810,6 @@ public void testMultiplicationNode() {
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
     assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(5d);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(5d);
-
     reset(mUIImplementationMock);
     mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
@@ -949,11 +911,6 @@ public void testInterpolationNode() {
     ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
       ArgumentCaptor.forClass(ReactStylesDiffMap.class);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(0d);
-
     for (int i = 0; i < frames.size(); i++) {
       reset(mUIImplementationMock);
       mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
@@ -1088,11 +1045,6 @@ public void testRestoreDefaultProps() {
     ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
       ArgumentCaptor.forClass(ReactStylesDiffMap.class);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(viewTag), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(1);
-
     for (int i = 0; i < frames.size(); i++) {
       reset(mUIImplementationMock);
       mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
@@ -1106,4 +1058,228 @@ public void testRestoreDefaultProps() {
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(viewTag), stylesCaptor.capture());
     assertThat(stylesCaptor.getValue().isNull("opacity"));
   }
+
+
+  /**
+   * Creates a following graph of nodes:
+   * Value(3, initialValue) ----> Style(4) ---> Props(5) ---> View(viewTag)
+   *
+   * Value(3) is set to track Value(1) via Tracking(2) node with the provided animation config
+   */
+  private void createAnimatedGraphWithTrackingNode(
+          int viewTag,
+          double initialValue,
+          JavaOnlyMap animationConfig) {
+    mNativeAnimatedNodesManager.createAnimatedNode(
+            1,
+            JavaOnlyMap.of("type", "value", "value", initialValue, "offset", 0d));
+    mNativeAnimatedNodesManager.createAnimatedNode(
+            3,
+            JavaOnlyMap.of("type", "value", "value", initialValue, "offset", 0d));
+
+    mNativeAnimatedNodesManager.createAnimatedNode(
+            2,
+            JavaOnlyMap.of("type", "tracking", "animationId", 70, "value", 3, "toValue", 1, "animationConfig", animationConfig));
+
+    mNativeAnimatedNodesManager.createAnimatedNode(
+            4,
+            JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("translateX", 3)));
+    mNativeAnimatedNodesManager.createAnimatedNode(
+            5,
+            JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 4)));
+    mNativeAnimatedNodesManager.connectAnimatedNodes(1, 2);
+    mNativeAnimatedNodesManager.connectAnimatedNodes(3, 4);
+    mNativeAnimatedNodesManager.connectAnimatedNodes(4, 5);
+    mNativeAnimatedNodesManager.connectAnimatedNodeToView(5, viewTag);
+  }
+
+  /**
+   * In this test we verify that when value is being tracked we can update destination value in the
+   * middle of ongoing animation and the animation will update and animate to the new spot. This is
+   * tested using simple 5 frame backed timing animation.
+   */
+  @Test
+  public void testTracking() {
+    JavaOnlyArray frames = JavaOnlyArray.of(0d, 0.25d, 0.5d, 0.75d, 1d);
+    JavaOnlyMap animationConfig = JavaOnlyMap.of("type", "frames", "frames", frames);
+
+    createAnimatedGraphWithTrackingNode(1000, 0d, animationConfig);
+
+    ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
+            ArgumentCaptor.forClass(ReactStylesDiffMap.class);
+
+    reset(mUIImplementationMock);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+    assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(0d);
+
+    // update "toValue" to 100, we expect tracking animation to animate now from 0 to 100 in 5 steps
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 100d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime()); // kick off the animation
+
+    for (int i = 0; i < frames.size(); i++) {
+      reset(mUIImplementationMock);
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      verify(mUIImplementationMock)
+              .synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+      assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN))
+              .isEqualTo(frames.getDouble(i) * 100d);
+    }
+
+    // update "toValue" to 0 but run only two frames from the animation,
+    // we expect tracking animation to animate now from 100 to 75
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 0d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime()); // kick off the animation
+
+    for (int i = 0; i < 2; i++) {
+      reset(mUIImplementationMock);
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      verify(mUIImplementationMock)
+              .synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+      assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN))
+              .isEqualTo(100d * (1d - frames.getDouble(i)));
+    }
+
+    // at this point we expect tracking value to be at 75
+    assertThat(((ValueAnimatedNode) mNativeAnimatedNodesManager.getNodeById(3)).getValue())
+            .isEqualTo(75d);
+
+    // we update "toValue" again to 100 and expect the animation to restart from the current place
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 100d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime()); // kick off the animation
+
+    for (int i = 0; i < frames.size(); i++) {
+      reset(mUIImplementationMock);
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      verify(mUIImplementationMock)
+              .synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+      assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN))
+              .isEqualTo(50d + 50d * frames.getDouble(i));
+    }
+  }
+
+  /**
+   * In this test we verify that when tracking is set up for a given animated node and when the
+   * animation settles it will not be registered as an active animation and therefore will not
+   * consume resources on running the animation that has already completed. Then we verify that when
+   * the value updates the animation will resume as expected and the complete again when reaches the
+   * end.
+   */
+  @Test
+  public void testTrackingPausesWhenEndValueIsReached() {
+    JavaOnlyArray frames = JavaOnlyArray.of(0d, 0.5d, 1d);
+    JavaOnlyMap animationConfig = JavaOnlyMap.of("type", "frames", "frames", frames);
+
+    createAnimatedGraphWithTrackingNode(1000, 0d, animationConfig);
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 100d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime()); // make sure animation starts
+
+    reset(mUIImplementationMock);
+    for (int i = 0; i < frames.size(); i++) {
+      assertThat(mNativeAnimatedNodesManager.hasActiveAnimations()).isTrue();
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    }
+    verify(mUIImplementationMock, times(frames.size()))
+            .synchronouslyUpdateViewOnUIThread(eq(1000), any(ReactStylesDiffMap.class));
+
+    // the animation has completed, we expect no updates to be done
+    reset(mUIImplementationMock);
+    assertThat(mNativeAnimatedNodesManager.hasActiveAnimations()).isFalse();
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verifyNoMoreInteractions(mUIImplementationMock);
+
+
+    // we update end value and expect the animation to restart
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 200d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime()); // make sure animation starts
+
+    reset(mUIImplementationMock);
+    for (int i = 0; i < frames.size(); i++) {
+      assertThat(mNativeAnimatedNodesManager.hasActiveAnimations()).isTrue();
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    }
+    verify(mUIImplementationMock, times(frames.size()))
+            .synchronouslyUpdateViewOnUIThread(eq(1000), any(ReactStylesDiffMap.class));
+
+    // the animation has completed, we expect no updates to be done
+    reset(mUIImplementationMock);
+    assertThat(mNativeAnimatedNodesManager.hasActiveAnimations()).isFalse();
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verifyNoMoreInteractions(mUIImplementationMock);
+  }
+
+  /**
+   * In this test we verify that when tracking is configured to use spring animation and when the
+   * destination value updates the current speed of the animated value will be taken into account
+   * while updating the spring animation and it will smoothly transition to the new end value.
+   */
+  @Test
+  public void testSpringTrackingRetainsSpeed() {
+    // this spring config correspomds to tension 20 and friction 0.5 which makes the spring settle
+    // very slowly
+    JavaOnlyMap springConfig = JavaOnlyMap.of(
+            "type",
+            "spring",
+            "restSpeedThreshold",
+            0.001,
+            "mass",
+            1d,
+            "restDisplacementThreshold",
+            0.001,
+            "initialVelocity",
+            0.5d,
+            "damping",
+            2.5,
+            "stiffness",
+            157.8,
+            "overshootClamping",
+            false);
+
+    createAnimatedGraphWithTrackingNode(1000, 0d, springConfig);
+
+    // update "toValue" to 1, we expect tracking animation to animate now from 0 to 1
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 1d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+
+    // we run several steps of animation until the value starts bouncing, has negative speed and
+    // passes the final point (that is 1) while going backwards
+    boolean isBoucingBack = false;
+    double previousValue = ((ValueAnimatedNode) mNativeAnimatedNodesManager.getNodeById(3)).getValue();
+    for (int maxFrames = 500; maxFrames > 0; maxFrames--) {
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      double currentValue = ((ValueAnimatedNode) mNativeAnimatedNodesManager.getNodeById(3)).getValue();
+      if (previousValue >= 1d && currentValue < 1d) {
+        isBoucingBack = true;
+        break;
+      }
+      previousValue = currentValue;
+    }
+    assertThat(isBoucingBack).isTrue();
+
+    // we now update "toValue" to 1.5 but since the value have negative speed and has also pretty
+    // low friction we expect it to keep going in the opposite direction for a few more frames
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 1.5d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    int bounceBackInitialFrames = 0;
+    boolean hasTurnedForward = false;
+
+    // we run 8 seconds of animation
+    for (int i = 0; i < 8 * 60; i++) {
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      double currentValue = ((ValueAnimatedNode) mNativeAnimatedNodesManager.getNodeById(3)).getValue();
+      if (!hasTurnedForward) {
+        if (currentValue <= previousValue) {
+          bounceBackInitialFrames++;
+        } else {
+          hasTurnedForward = true;
+        }
+      }
+      previousValue = currentValue;
+    }
+    assertThat(hasTurnedForward).isEqualTo(true);
+    assertThat(bounceBackInitialFrames).isGreaterThan(3);
+
+    // we verify that the value settled at 2
+    assertThat(previousValue).isEqualTo(1.5d);
+  }
 }
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java
index 6af5b690529935..637bd812b35c83 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java
index df8e0002834400..6b0a18177a1740 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java
index 1ce3971258051c..d2d95b197ae412 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java
index 2e6466a88ba848..353d743587d333 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java
index 772e506d68f765..4f01b2070ae051 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
index 1886a481b3dc1a..e35d7ea8f583a3 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
index ec8637c068e5d0..4763eabbed21a4 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
index 08089511f7bfe1..04a947a346403e 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
@@ -24,14 +22,19 @@
 @RunWith(RobolectricTestRunner.class)
 public class MultipartStreamReaderTest {
 
-  class CallCountTrackingChunkCallback implements MultipartStreamReader.ChunkCallback {
+  class CallCountTrackingChunkCallback implements MultipartStreamReader.ChunkListener {
     private int mCount = 0;
 
     @Override
-    public void execute(Map<String, String> headers, Buffer body, boolean done) throws IOException {
+    public void onChunkComplete(Map<String, String> headers, Buffer body, boolean done) throws IOException {
       mCount++;
     }
 
+    @Override
+    public void onChunkProgress(Map<String, String> headers, long loaded, long total) throws IOException {
+
+    }
+
     public int getCallCount() {
       return mCount;
     }
@@ -41,12 +44,12 @@ public int getCallCount() {
   public void testSimpleCase() throws IOException {
     ByteString response = ByteString.encodeUtf8(
       "preable, should be ignored\r\n" +
-      "--sample_boundary\r\n" +
-      "Content-Type: application/json; charset=utf-8\r\n" +
-      "Content-Length: 2\r\n\r\n" +
-      "{}\r\n" +
-      "--sample_boundary--\r\n" +
-      "epilogue, should be ignored");
+        "--sample_boundary\r\n" +
+        "Content-Type: application/json; charset=utf-8\r\n" +
+        "Content-Length: 2\r\n\r\n" +
+        "{}\r\n" +
+        "--sample_boundary--\r\n" +
+        "epilogue, should be ignored");
 
     Buffer source = new Buffer();
     source.write(response);
@@ -55,8 +58,8 @@ public void testSimpleCase() throws IOException {
 
     CallCountTrackingChunkCallback callback = new CallCountTrackingChunkCallback() {
       @Override
-      public void execute(Map<String, String> headers, Buffer body, boolean done) throws IOException {
-        super.execute(headers, body, done);
+      public void onChunkComplete(Map<String, String> headers, Buffer body, boolean done) throws IOException {
+        super.onChunkComplete(headers, body, done);
 
         assertThat(done).isTrue();
         assertThat(headers.get("Content-Type")).isEqualTo("application/json; charset=utf-8");
@@ -89,8 +92,8 @@ public void testMultipleParts() throws IOException {
 
     CallCountTrackingChunkCallback callback = new CallCountTrackingChunkCallback() {
       @Override
-      public void execute(Map<String, String> headers, Buffer body, boolean done) throws IOException {
-        super.execute(headers, body, done);
+      public void onChunkComplete(Map<String, String> headers, Buffer body, boolean done) throws IOException {
+        super.onChunkComplete(headers, body, done);
 
         assertThat(done).isEqualTo(getCallCount() == 3);
         assertThat(body.readUtf8()).isEqualTo(String.valueOf(getCallCount()));
@@ -122,12 +125,12 @@ public void testNoDelimiter() throws IOException {
   public void testNoCloseDelimiter() throws IOException {
     ByteString response = ByteString.encodeUtf8(
       "preable, should be ignored\r\n" +
-      "--sample_boundary\r\n" +
-      "Content-Type: application/json; charset=utf-8\r\n" +
-      "Content-Length: 2\r\n\r\n" +
-      "{}\r\n" +
-      "--sample_boundary\r\n" +
-      "incomplete message...");
+        "--sample_boundary\r\n" +
+        "Content-Type: application/json; charset=utf-8\r\n" +
+        "Content-Length: 2\r\n\r\n" +
+        "{}\r\n" +
+        "--sample_boundary\r\n" +
+        "incomplete message...");
 
     Buffer source = new Buffer();
     source.write(response);
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java
index 3ece540947fcef..b348bd14995dc3 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java
index 4339dcd5e4b3db..67283dc0e6e8b7 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.blob;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java
index 5c618858d0bc7e..1ed67fb9434acb 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.camera;
 
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
index adfa1e2eac1a21..a0d93c4db3bd3e 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.clipboard;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
index 0d5ff98fda22ec..847c71954a75bb 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.dialog;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
index 8ad39cd16e2070..456a108f346922 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
@@ -170,6 +168,34 @@ public void testFailPostWithoutContentType() throws Exception {
     verifyErrorEmit(emitter, 0);
   }
 
+  @Test
+  public void testFailInvalidUrl() throws Exception {
+    RCTDeviceEventEmitter emitter = mock(RCTDeviceEventEmitter.class);
+    ReactApplicationContext context = mock(ReactApplicationContext.class);
+    when(context.getJSModule(any(Class.class))).thenReturn(emitter);
+
+    OkHttpClient httpClient = mock(OkHttpClient.class);
+    OkHttpClient.Builder clientBuilder = mock(OkHttpClient.Builder.class);
+    when(clientBuilder.build()).thenReturn(httpClient);
+    when(httpClient.newBuilder()).thenReturn(clientBuilder);
+    NetworkingModule networkingModule = new NetworkingModule(context, "", httpClient);
+
+    mockEvents();
+
+    networkingModule.sendRequest(
+      "GET",
+      "aaa",
+      /* requestId */ 0,
+      /* headers */ JavaOnlyArray.of(),
+      /* body */ null,
+      /* responseType */ "text",
+      /* useIncrementalUpdates*/ true,
+      /* timeout */ 0,
+      /* withCredentials */ false);
+
+    verifyErrorEmit(emitter, 0);
+  }
+
   private static void verifyErrorEmit(RCTDeviceEventEmitter emitter, int requestId) {
     ArgumentCaptor<WritableArray> captor = ArgumentCaptor.forClass(WritableArray.class);
     verify(emitter).emit(eq("didCompleteNetworkResponse"), captor.capture());
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java
index a43a32c8752f64..09b2365513ec54 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.network;
 
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java
index f9d1b31e7037db..86f99cd9dc1928 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.share;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java
index 291e1604819de3..472f9678f79008 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.storage;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
index b98071d331e9f2..91c6484846f449 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timing;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
index 9a2de1dbea1846..6d14bef454fcb3 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java
index f516e3b40586e7..3d78d5cf43140a 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java
index 8df49c6f6e69ab..f989f62dd5c1ed 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java
index 33e0b8892e8fce..d06f810e10b931 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java
index 2c849051ea2f21..a4ee1a39056db8 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java
index 04f57cda05e2ff..799018bfa4600d 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java
index 8b9717dd7ebe9c..0120f7a0865106 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
index b97941d93f3e26..0b3ac61dfe3317 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java
index 687440a1dc3ce0..40a8c68b46697f 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
index 70bfac8f3f77e4..6a90e84b628cd1 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java
index 55ace7944c72fa..5bea9ba4d1fb33 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
index 0e051ab79fbd32..93dc7845007e09 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java
index 7cb756121cd9ee..628b43c7c3f611 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.slider;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.java
index 5d3919105ae232..eadb7d3544bcb5 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.java
@@ -13,7 +13,7 @@
 public class CustomLineHeightSpanTest {
 
   @Test
-  public void shouldIncreaseAllMetricsProportionally() {
+  public void evenLineHeightShouldIncreaseAllMetricsProportionally() {
     CustomLineHeightSpan customLineHeightSpan = new CustomLineHeightSpan(22);
     Paint.FontMetricsInt fm = new Paint.FontMetricsInt();
     fm.top = -10;
@@ -21,10 +21,27 @@ public void shouldIncreaseAllMetricsProportionally() {
     fm.descent = 5;
     fm.bottom = 10;
     customLineHeightSpan.chooseHeight("Hi", 0, 2, 0, 0, fm);
+    // Since line height is even it should be equally added to top and bottom.
     assertThat(fm.top).isEqualTo(-11);
-    assertThat(fm.ascent).isEqualTo(-6);
-    assertThat(fm.descent).isEqualTo(6);
+    assertThat(fm.ascent).isEqualTo(-11);
+    assertThat(fm.descent).isEqualTo(11);
     assertThat(fm.bottom).isEqualTo(11);
+    assertThat(fm.bottom - fm.top).isEqualTo(22);
+  }
+
+  @Test
+  public void oddLineHeightShouldAlsoWork() {
+    CustomLineHeightSpan customLineHeightSpan = new CustomLineHeightSpan(23);
+    Paint.FontMetricsInt fm = new Paint.FontMetricsInt();
+    fm.top = -10;
+    fm.ascent = -5;
+    fm.descent = 5;
+    fm.bottom = 10;
+    customLineHeightSpan.chooseHeight("Hi", 0, 2, 0, 0, fm);
+    // Only test that the sum is correct so the implementation
+    // is free to add the odd value either on top or bottom.
+    assertThat(fm.descent - fm.ascent).isEqualTo(23);
+    assertThat(fm.bottom - fm.top).isEqualTo(23);
   }
 
   @Test
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java
index 7e5765d06c4638..2c14111e4acd8f 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
index cd2bc0e7c9607b..89e9b0a5bdfe43 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java
index ae5a7d90f9c35c..988482eeabdeeb 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java
index 9b79b2594f0acb..335458952a13c1 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java b/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java
index 20f4aa035f43f2..427dd77b534134 100644
--- a/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java
+++ b/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package org.mockito.configuration;
diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 24d1d421e6f6ae..5f84b3fd5a241b 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -1,4 +1,4 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "DEBUG_PREPROCESSOR_FLAGS")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "ANDROID_INSPECTOR_FLAGS", "APPLE_INSPECTOR_FLAGS", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "react_native_xplat_target")
 
 CXX_LIBRARY_COMPILER_FLAGS = [
@@ -9,8 +9,8 @@ CXX_LIBRARY_COMPILER_FLAGS = [
 APPLE_COMPILER_FLAGS = []
 
 if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "STATIC_LIBRARY_IOS_FLAGS", "flags")
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(STATIC_LIBRARY_IOS_FLAGS, 'compiler_flags')
+    load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags")
+    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags')
 
 rn_xplat_cxx_library(
     name = "module",
@@ -139,7 +139,7 @@ rn_xplat_cxx_library(
     fbobjc_frameworks = [
         "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
     ],
-    fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS + APPLE_INSPECTOR_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS,
     force_static = True,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
diff --git a/ReactCommon/cxxreact/Instance.h b/ReactCommon/cxxreact/Instance.h
index bcd0bea395acb3..e35ce4bbe2ac3e 100644
--- a/ReactCommon/cxxreact/Instance.h
+++ b/ReactCommon/cxxreact/Instance.h
@@ -63,15 +63,6 @@ class RN_EXPORT Instance {
   // This method is experimental, and may be modified or removed.
   void registerBundle(uint32_t bundleId, const std::string& bundlePath);
 
-  // This method is experimental, and may be modified or removed.
-  template <typename T>
-  Value callFunctionSync(const std::string &module, const std::string &method,
-                         T &&args) {
-    CHECK(nativeToJsBridge_);
-    return nativeToJsBridge_->callFunctionSync(module, method,
-                                               std::forward<T>(args));
-  }
-
   const ModuleRegistry &getModuleRegistry() const;
   ModuleRegistry &getModuleRegistry();
 
diff --git a/ReactCommon/cxxreact/JSCExecutor.cpp b/ReactCommon/cxxreact/JSCExecutor.cpp
index 01c8c96de19560..81e71eddbaa5e9 100644
--- a/ReactCommon/cxxreact/JSCExecutor.cpp
+++ b/ReactCommon/cxxreact/JSCExecutor.cpp
@@ -581,30 +581,6 @@ namespace facebook {
       callNativeModules(std::move(result));
     }
 
-    Value JSCExecutor::callFunctionSyncWithValue(
-                                                 const std::string& module, const std::string& method, Value args) {
-      SystraceSection s("JSCExecutor::callFunction");
-      Object result = [&] {
-        JSContextLock lock(m_context);
-        if (!m_callFunctionReturnResultAndFlushedQueueJS) {
-          bindBridge();
-        }
-        return m_callFunctionReturnResultAndFlushedQueueJS->callAsFunction({
-          Value(m_context, String::createExpectingAscii(m_context, module)),
-          Value(m_context, String::createExpectingAscii(m_context, method)),
-          std::move(args),
-        }).asObject();
-      }();
-
-      Value length = result.getProperty("length");
-
-      if (!length.isNumber() || length.asInteger() != 2) {
-        std::runtime_error("Return value of a callFunction must be an array of size 2");
-      }
-      callNativeModules(result.getPropertyAtIndex(1));
-      return result.getPropertyAtIndex(0);
-    }
-
     void JSCExecutor::setGlobalVariable(std::string propName, std::unique_ptr<const JSBigString> jsonValue) {
       try {
         SystraceSection s("JSCExecutor::setGlobalVariable", "propName", propName);
diff --git a/ReactCommon/cxxreact/JSCExecutor.h b/ReactCommon/cxxreact/JSCExecutor.h
index 258697af5c9587..5acc967722e5ca 100644
--- a/ReactCommon/cxxreact/JSCExecutor.h
+++ b/ReactCommon/cxxreact/JSCExecutor.h
@@ -79,14 +79,6 @@ class RN_EXPORT JSCExecutor : public JSExecutor, public PrivateDataBase {
     const double callbackId,
     const folly::dynamic& arguments) override;
 
-  template <typename T>
-  Value callFunctionSync(
-      const std::string& module, const std::string& method, T&& args) {
-    return callFunctionSyncWithValue(
-      module, method, JSCValueEncoder<typename std::decay<T>::type>::toJSCValue(
-        m_context, std::forward<T>(args)));
-  }
-
   virtual void setGlobalVariable(
     std::string propName,
     std::unique_ptr<const JSBigString> jsonValue) override;
@@ -123,9 +115,6 @@ class RN_EXPORT JSCExecutor : public JSExecutor, public PrivateDataBase {
 
   void initOnJSVMThread() throw(JSException);
   static bool isNetworkInspected(const std::string &owner, const std::string &app, const std::string &device);
-  // This method is experimental, and may be modified or removed.
-  Value callFunctionSyncWithValue(
-    const std::string& module, const std::string& method, Value value);
   void terminateOnJSVMThread();
   void bindBridge() throw(JSException);
   void callNativeModules(Value&&);
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.h b/ReactCommon/cxxreact/NativeToJsBridge.h
index 586766e387bdab..78d960a08a4529 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.h
+++ b/ReactCommon/cxxreact/NativeToJsBridge.h
@@ -55,35 +55,6 @@ class NativeToJsBridge {
    */
   void invokeCallback(double callbackId, folly::dynamic&& args);
 
-  /**
-   * Executes a JS method on the given executor synchronously, returning its
-   * return value.  JSException will be thrown if JS throws an exception;
-   * another standard exception may be thrown for C++ bridge failures, or if
-   * the executor is not capable of synchronous calls.
-   *
-   * This method is experimental, and may be modified or removed.
-   *
-   * loadApplicationScriptSync() must be called and finished executing
-   * before callFunctionSync().
-   */
-  template <typename T>
-  Value callFunctionSync(const std::string& module, const std::string& method, T&& args) {
-    if (*m_destroyed) {
-      throw std::logic_error(
-        folly::to<std::string>("Synchronous call to ", module, ".", method,
-                               " after bridge is destroyed"));
-    }
-
-    JSCExecutor *jscExecutor = dynamic_cast<JSCExecutor*>(m_executor.get());
-    if (!jscExecutor) {
-      throw std::invalid_argument(
-        folly::to<std::string>("Executor type ", typeid(m_executor.get()).name(),
-                               " does not support synchronous calls"));
-    }
-
-    return jscExecutor->callFunctionSync(module, method, std::forward<T>(args));
-  }
-
   /**
    * Starts the JS application.  If bundleRegistry is non-null, then it is
    * used to fetch JavaScript modules as individual scripts.
diff --git a/ReactCommon/cxxreact/tests/BUCK b/ReactCommon/cxxreact/tests/BUCK
index 09c0a244fb7115..010e7c8e50d069 100644
--- a/ReactCommon/cxxreact/tests/BUCK
+++ b/ReactCommon/cxxreact/tests/BUCK
@@ -11,8 +11,8 @@ TEST_SRCS = [
 ]
 
 if not IS_OSS_BUILD:
+    load("@xplat//build_defs:fb_xplat_cxx.bzl", "cxx_test")
     load("@xplat//configurations/buck/android:jni_instrumentation_test", "jni_instrumentation_test_lib")
-    load("@xplat//configurations/buck:fb_xplat_cxx.bzl", "cxx_test")
     load("@xplat//configurations/buck:default_platform_defs.bzl", "APPLE")
     jni_instrumentation_test_lib(
         name = 'tests',
diff --git a/ReactCommon/fabric/BUCK b/ReactCommon/fabric/BUCK
new file mode 100644
index 00000000000000..6788c76801c954
--- /dev/null
+++ b/ReactCommon/fabric/BUCK
@@ -0,0 +1,44 @@
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_xplat_target", "rn_xplat_cxx_library", "APPLE_INSPECTOR_FLAGS")
+
+APPLE_COMPILER_FLAGS = []
+
+if not IS_OSS_BUILD:
+    load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags")
+    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags')
+
+rn_xplat_cxx_library(
+    name = "fabric",
+    srcs = glob(["*.cpp"]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "fabric",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS,
+    force_static = True,
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        "xplat//fbsystrace:fbsystrace",
+        "xplat//folly:headers_only",
+        "xplat//folly:memory",
+        "xplat//folly:molly",
+        "xplat//third-party/glog:glog",
+        react_native_xplat_target("fabric/core:core"),
+    ],
+)
diff --git a/ReactCommon/fabric/FabricUIManager.cpp b/ReactCommon/fabric/FabricUIManager.cpp
new file mode 100644
index 00000000000000..54262fc9edbf2e
--- /dev/null
+++ b/ReactCommon/fabric/FabricUIManager.cpp
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "FabricUIManager.h"
+
+#include "IFabricPlatformUIOperationManager.h"
+#include "ShadowNode.h"
+
+namespace facebook {
+namespace react {
+
+FabricUIManager::FabricUIManager(const std::shared_ptr<IFabricPlatformUIOperationManager> &platformUIOperationManager) :
+  platformUIOperationManager_(platformUIOperationManager) {};
+
+ShadowNodeRef FabricUIManager::createNode(int reactTag, std::string viewName, int rootTag, folly::dynamic props, void *instanceHandle) {
+  platformUIOperationManager_->performUIOperation();
+  return std::make_shared<ShadowNode>(reactTag, viewName, rootTag, props, instanceHandle);
+}
+
+ShadowNodeRef FabricUIManager::cloneNode(const ShadowNodeRef &node) {
+  return nullptr;
+}
+
+ShadowNodeRef FabricUIManager::cloneNodeWithNewChildren(const ShadowNodeRef &node) {
+  return nullptr;
+}
+
+ShadowNodeRef FabricUIManager::cloneNodeWithNewProps(const ShadowNodeRef &node, folly::dynamic props) {
+  return nullptr;
+}
+
+ShadowNodeRef FabricUIManager::cloneNodeWithNewChildrenAndProps(const ShadowNodeRef &node, folly::dynamic newProps) {
+  return nullptr;
+}
+
+void FabricUIManager::appendChild(const ShadowNodeRef &parentNode, const ShadowNodeRef &childNode) {
+}
+
+ShadowNodeSetRef FabricUIManager::createChildSet(int rootTag) {
+  return nullptr;
+}
+
+void FabricUIManager::appendChildToSet(const ShadowNodeSetRef &childSet, const ShadowNodeRef &childNode) {
+}
+
+void FabricUIManager::completeRoot(int rootTag, const ShadowNodeSetRef &childSet) {
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/FabricUIManager.h b/ReactCommon/fabric/FabricUIManager.h
new file mode 100644
index 00000000000000..06ee2a94f70e80
--- /dev/null
+++ b/ReactCommon/fabric/FabricUIManager.h
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <folly/dynamic.h>
+#include <folly/FBVector.h>
+#include <memory>
+
+namespace facebook {
+namespace react {
+
+class ShadowNode;
+class IFabricPlatformUIOperationManager;
+
+typedef std::shared_ptr<const ShadowNode> ShadowNodeRef;
+typedef folly::fbvector<const ShadowNodeRef> ShadowNodeSet;
+typedef std::shared_ptr<const ShadowNodeSet> ShadowNodeSetRef;
+
+class FabricUIManager {
+public:
+  FabricUIManager(const std::shared_ptr<IFabricPlatformUIOperationManager> &platformUIOperationManager);
+
+  ShadowNodeRef createNode(int reactTag, std::string viewName, int rootTag, folly::dynamic props, void *instanceHandle);
+  ShadowNodeRef cloneNode(const ShadowNodeRef &node);
+  ShadowNodeRef cloneNodeWithNewChildren(const ShadowNodeRef &node);
+  ShadowNodeRef cloneNodeWithNewProps(const ShadowNodeRef &node, folly::dynamic props);
+  ShadowNodeRef cloneNodeWithNewChildrenAndProps(const ShadowNodeRef &node, folly::dynamic newProps);
+  void appendChild(const ShadowNodeRef &parentNode, const ShadowNodeRef &childNode);
+  ShadowNodeSetRef createChildSet(int rootTag);
+  void appendChildToSet(const ShadowNodeSetRef &childSet, const ShadowNodeRef &childNode);
+  void completeRoot(int rootTag, const ShadowNodeSetRef &childSet);
+
+private:
+  std::shared_ptr<IFabricPlatformUIOperationManager> platformUIOperationManager_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/IFabricPlatformUIOperationManager.h b/ReactCommon/fabric/IFabricPlatformUIOperationManager.h
new file mode 100644
index 00000000000000..ff1434c7520d9f
--- /dev/null
+++ b/ReactCommon/fabric/IFabricPlatformUIOperationManager.h
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+namespace facebook {
+namespace react {
+
+/**
+ * An interface for FabricUIManager to perform platform-specific UI operations, like updating native UIView's in iOS.
+ */
+class IFabricPlatformUIOperationManager {
+public:
+  // TODO: add meaningful methods
+  virtual void performUIOperation() = 0;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/ShadowNode.cpp b/ReactCommon/fabric/ShadowNode.cpp
new file mode 100644
index 00000000000000..9f675572bc81c3
--- /dev/null
+++ b/ReactCommon/fabric/ShadowNode.cpp
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ShadowNode.h"
+
+namespace facebook {
+namespace react {
+
+ShadowNode::ShadowNode(int reactTag, std::string viewName, int rootTag, folly::dynamic props, void *instanceHandle) :
+  reactTag_(reactTag),
+  viewName_(viewName),
+  rootTag_(rootTag),
+  props_(props),
+  instanceHandle_(instanceHandle) {}
+
+}}
diff --git a/ReactCommon/fabric/ShadowNode.h b/ReactCommon/fabric/ShadowNode.h
new file mode 100644
index 00000000000000..257b7c19e940c9
--- /dev/null
+++ b/ReactCommon/fabric/ShadowNode.h
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <folly/dynamic.h>
+#include <memory>
+
+namespace facebook {
+namespace react {
+
+class ShadowNode {
+public:
+  int reactTag_;
+  std::string viewName_;
+  int rootTag_;
+  folly::dynamic props_;
+  void *instanceHandle_;
+
+  ShadowNode(int reactTag, std::string viewName, int rootTag, folly::dynamic props, void *instanceHandle);
+};
+
+}}
diff --git a/ReactCommon/fabric/core/BUCK b/ReactCommon/fabric/core/BUCK
new file mode 100644
index 00000000000000..4001090955b434
--- /dev/null
+++ b/ReactCommon/fabric/core/BUCK
@@ -0,0 +1,51 @@
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_xplat_target", "rn_xplat_cxx_library", "APPLE_INSPECTOR_FLAGS")
+
+APPLE_COMPILER_FLAGS = []
+
+if not IS_OSS_BUILD:
+    load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags")
+    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags')
+
+rn_xplat_cxx_library(
+    name = "core",
+    srcs = glob(
+        [
+            "**/*.cpp",
+        ],
+    ),
+    headers = glob(
+        [
+            "**/*.h",
+        ],
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("primitives", "*.h"),
+        ],
+        prefix = "fabric/core",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS,
+    force_static = True,
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "xplat//fbsystrace:fbsystrace",
+        "xplat//folly:headers_only",
+        "xplat//folly:memory",
+        "xplat//folly:molly",
+        "xplat//third-party/glog:glog",
+        react_native_xplat_target("fabric/debug:debug"),
+    ],
+)
diff --git a/ReactCommon/fabric/core/primitives/Sealable.cpp b/ReactCommon/fabric/core/primitives/Sealable.cpp
new file mode 100644
index 00000000000000..fc4bb8c259ec4d
--- /dev/null
+++ b/ReactCommon/fabric/core/primitives/Sealable.cpp
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "Sealable.h"
+
+#include <stdexcept>
+
+namespace facebook {
+namespace react {
+
+void Sealable::seal() const {
+  sealed_ = true;
+}
+
+bool Sealable::getSealed() const {
+  return sealed_;
+}
+
+void Sealable::ensureUnsealed() const {
+  if (sealed_) {
+    throw std::runtime_error("Attempt to mutate a sealed object.");
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/core/primitives/Sealable.h b/ReactCommon/fabric/core/primitives/Sealable.h
new file mode 100644
index 00000000000000..1f8fa0f093a073
--- /dev/null
+++ b/ReactCommon/fabric/core/primitives/Sealable.h
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+namespace facebook {
+namespace react {
+
+/*
+ * Represents something which can be *sealed* (imperatively marked as immutable).
+ *
+ * Why do we need this? In Fabric, some objects are semi-immutable
+ * even if they explicitly marked as `const`. It means that in some special
+ * cases those objects can be const-cast-away and then mutated. That comes from
+ * the fact that we share some object's life-cycle responsibilities with React
+ * and the immutability is guaranteed by some logic splitted between native and
+ * JavaScript worlds (which makes impossible to fully use immutability
+ * enforcement at a language level).
+ * To detect possible errors as early as possible we additionally mark objects
+ * as *sealed* after some stage and then enforce this at run-time.
+ *
+ * How to use:
+ *   1. Inherit your class from `Sealable`.
+ *   2. Call `ensureUnsealed()` from all non-const methods.
+ *   3. Call `seal()` at some point from which any modifications
+ *      must be prevented.
+ */
+class Sealable {
+public:
+  /*
+   * Seals the object. This operation is irreversible;
+   * the object cannot be "unsealed" after being sealing.
+   */
+  void seal() const;
+
+  /*
+   * Returns if the object already sealed or not.
+   */
+  bool getSealed() const;
+
+protected:
+  /*
+   * Throws an exception if the object is sealed.
+   * Call this from all non-`const` methods.
+   */
+  void ensureUnsealed() const;
+
+private:
+  mutable bool sealed_ {false};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/debug/BUCK b/ReactCommon/fabric/debug/BUCK
new file mode 100644
index 00000000000000..5a021202ebb776
--- /dev/null
+++ b/ReactCommon/fabric/debug/BUCK
@@ -0,0 +1,46 @@
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_xplat_target", "rn_xplat_cxx_library", "APPLE_INSPECTOR_FLAGS")
+
+APPLE_COMPILER_FLAGS = []
+
+if not IS_OSS_BUILD:
+    load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags")
+    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags')
+
+rn_xplat_cxx_library(
+    name = "debug",
+    srcs = glob(
+        [
+            "**/*.cpp",
+        ],
+    ),
+    headers = glob(
+        [
+            "**/*.h",
+        ],
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "fabric/debug",
+    ),
+    compiler_flags = [
+        "-std=c++14",
+        "-Wall",
+        "-fexceptions",
+        "-frtti",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS,
+    force_static = True,
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "xplat//folly:headers_only",
+    ],
+)
diff --git a/ReactCommon/fabric/debug/DebugStringConvertible.cpp b/ReactCommon/fabric/debug/DebugStringConvertible.cpp
new file mode 100644
index 00000000000000..8186297643e98f
--- /dev/null
+++ b/ReactCommon/fabric/debug/DebugStringConvertible.cpp
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "DebugStringConvertible.h"
+
+namespace facebook {
+namespace react {
+
+std::string DebugStringConvertible::getDebugChildrenDescription(int level) const {
+  std::string childrenString = "";
+
+  for (auto child : getDebugChildren()) {
+    childrenString += child->getDebugDescription(level + 1);
+  }
+
+  return childrenString;
+}
+
+std::string DebugStringConvertible::getDebugPropsDescription(int level) const {
+  std::string propsString = "";
+
+  for (auto prop : getDebugProps()) {
+    auto name = prop->getDebugName();
+    auto value = prop->getDebugValue();
+    auto children = prop->getDebugPropsDescription(level + 1);
+    auto valueAndChildren = value + (children.empty() ? "" : "(" + children + ")");
+    propsString += " " + name + (valueAndChildren.empty() ? "" : "=" + valueAndChildren);
+  }
+
+  if (!propsString.empty()) {
+    // Removing leading space character.
+    propsString.erase(propsString.begin());
+  }
+
+  return propsString;
+}
+
+std::string DebugStringConvertible::getDebugDescription(int level) const {
+  std::string nameString = getDebugName();
+  std::string valueString = getDebugValue();
+  std::string childrenString = getDebugChildrenDescription(level);
+  std::string propsString = getDebugPropsDescription(level);
+
+  return "<" + nameString +
+    (valueString.empty() ? "" : "=" + valueString) +
+    (propsString.empty() ? "" : " " + propsString) +
+    (childrenString.empty() ? "/>" : ">" + childrenString + "</" + nameString + ">");
+}
+
+std::string DebugStringConvertible::getDebugName() const {
+  return "Node";
+}
+
+std::string DebugStringConvertible::getDebugValue() const {
+  return "";
+}
+
+SharedDebugStringConvertibleList DebugStringConvertible::getDebugChildren() const {
+  return SharedDebugStringConvertibleList();
+}
+
+SharedDebugStringConvertibleList DebugStringConvertible::getDebugProps() const {
+  return SharedDebugStringConvertibleList();
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/debug/DebugStringConvertible.h b/ReactCommon/fabric/debug/DebugStringConvertible.h
new file mode 100644
index 00000000000000..b743a933243d74
--- /dev/null
+++ b/ReactCommon/fabric/debug/DebugStringConvertible.h
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace facebook {
+namespace react {
+
+class DebugStringConvertible;
+
+using SharedDebugStringConvertible = std::shared_ptr<const DebugStringConvertible>;
+using SharedDebugStringConvertibleList = std::vector<const SharedDebugStringConvertible>;
+
+// Abstract class describes conformance to DebugStringConvertible concept
+// and implements basic recursive debug string assembly algorithm.
+// Use this as a base class for providing a debugging textual representation
+// of your class.
+// TODO (#26770211): Clear up the naming.
+class DebugStringConvertible {
+
+public:
+  // Returns a name of the object.
+  // Default implementation returns "Node".
+  virtual std::string getDebugName() const;
+
+  // Returns a value assosiate with the object.
+  // Default implementation returns an empty string.
+  virtual std::string getDebugValue() const;
+
+  // Returns a list of `DebugStringConvertible` objects which can be considered
+  // as *children* of the object.
+  // Default implementation returns an empty list.
+  virtual SharedDebugStringConvertibleList getDebugChildren() const;
+
+  // Returns a list of `DebugStringConvertible` objects which can be considered
+  // as *properties* of the object.
+  // Default implementation returns an empty list.
+  virtual SharedDebugStringConvertibleList getDebugProps() const;
+
+  // Returns a string which represents the object in a human-readable way.
+  // Default implementation returns a description of the subtree
+  // rooted at this node, represented in XML-like format.
+  virtual std::string getDebugDescription(int level = 0) const;
+
+  // Do same as `getDebugDescription` but return only *children* and
+  // *properties* parts (which are used in `getDebugDescription`).
+  virtual std::string getDebugPropsDescription(int level = 0) const;
+  virtual std::string getDebugChildrenDescription(int level = 0) const;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp b/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp
new file mode 100644
index 00000000000000..8baffb5b75d5a2
--- /dev/null
+++ b/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "DebugStringConvertibleItem.h"
+
+namespace facebook {
+namespace react {
+
+DebugStringConvertibleItem::DebugStringConvertibleItem(
+  const std::string &name,
+  const std::string &value,
+  const SharedDebugStringConvertibleList &props,
+  const SharedDebugStringConvertibleList &children
+):
+  name_(name),
+  value_(value),
+  props_(props),
+  children_(children) {}
+
+std::string DebugStringConvertibleItem::getDebugName() const {
+  return name_;
+}
+
+std::string DebugStringConvertibleItem::getDebugValue() const {
+  return value_;
+}
+
+SharedDebugStringConvertibleList DebugStringConvertibleItem::getDebugProps() const {
+  return props_;
+}
+
+SharedDebugStringConvertibleList DebugStringConvertibleItem::getDebugChildren() const {
+  return children_;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/debug/DebugStringConvertibleItem.h b/ReactCommon/fabric/debug/DebugStringConvertibleItem.h
new file mode 100644
index 00000000000000..257ea1db2bc04a
--- /dev/null
+++ b/ReactCommon/fabric/debug/DebugStringConvertibleItem.h
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fabric/debug/DebugStringConvertible.h>
+
+namespace facebook {
+namespace react {
+
+// Trivial implementation of `DebugStringConvertible` abstract class
+// with a stored output; useful for assembling `DebugStringConvertible` values
+// in custom implementations of `getDebugChildren` and `getDebugProps`.
+class DebugStringConvertibleItem:
+  public DebugStringConvertible {
+
+public:
+  DebugStringConvertibleItem() = default;
+  DebugStringConvertibleItem(const DebugStringConvertibleItem &item) = default;
+
+  DebugStringConvertibleItem(
+    const std::string &name = "",
+    const std::string &value = "",
+    const SharedDebugStringConvertibleList &props = {},
+    const SharedDebugStringConvertibleList &children = {}
+  );
+
+  std::string getDebugName() const override;
+  std::string getDebugValue() const override;
+  SharedDebugStringConvertibleList getDebugChildren() const override;
+  SharedDebugStringConvertibleList getDebugProps() const override;
+
+private:
+  std::string name_;
+  std::string value_;
+  SharedDebugStringConvertibleList props_;
+  SharedDebugStringConvertibleList children_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/jschelpers/JSCWrapper.cpp b/ReactCommon/jschelpers/JSCWrapper.cpp
index 422fb7f8ea4e06..bc432eb05f624a 100644
--- a/ReactCommon/jschelpers/JSCWrapper.cpp
+++ b/ReactCommon/jschelpers/JSCWrapper.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "JSCWrapper.h"
diff --git a/ReactCommon/jschelpers/JSCWrapper.h b/ReactCommon/jschelpers/JSCWrapper.h
index c722199c2dfd1a..d221ea7eb410e6 100644
--- a/ReactCommon/jschelpers/JSCWrapper.h
+++ b/ReactCommon/jschelpers/JSCWrapper.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
@@ -54,9 +52,9 @@ JSC_IMPORT void FBJSContextStartGCTimers(JSContextRef);
 #endif
 
 #if defined(__APPLE__)
-#import <objc/objc.h>
-#import <JavaScriptCore/JSStringRefCF.h>
-#import <string>
+#include <objc/objc.h>
+#include <JavaScriptCore/JSStringRefCF.h>
+#include <string>
 
 /**
  * JSNoBytecodeFileFormatVersion
@@ -141,6 +139,7 @@ struct JSCWrapper {
   JSC_WRAPPER_METHOD(JSValueToObject);
   JSC_WRAPPER_METHOD(JSValueToStringCopy);
   JSC_WRAPPER_METHOD(JSValueUnprotect);
+  JSC_WRAPPER_METHOD(JSValueIsNull);
 
   // Sampling profiler
   JSC_WRAPPER_METHOD(JSSamplingProfilerEnabled);
diff --git a/ReactCommon/jschelpers/JavaScriptCore.h b/ReactCommon/jschelpers/JavaScriptCore.h
index 9cae11681117cc..ff3dfd3b5dd072 100644
--- a/ReactCommon/jschelpers/JavaScriptCore.h
+++ b/ReactCommon/jschelpers/JavaScriptCore.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
@@ -124,6 +122,7 @@ jsc_poison(JSStringCopyCFString JSStringCreateWithCharacters JSStringCreateWithC
 #define JSC_JSValueToObject(...) __jsc_wrapper(JSValueToObject, __VA_ARGS__)
 #define JSC_JSValueToStringCopy(...) __jsc_wrapper(JSValueToStringCopy, __VA_ARGS__)
 #define JSC_JSValueUnprotect(...) __jsc_wrapper(JSValueUnprotect, __VA_ARGS__)
+#define JSC_JSValueIsNull(...) __jsc_wrapper(JSValueIsNull, __VA_ARGS__)
 
 jsc_poison(JSValueCreateJSONString JSValueGetType JSValueGetTypedArrayType JSValueIsArray
            JSValueIsBoolean JSValueIsDate JSValueIsEqual JSValueIsInstanceOfConstructor
diff --git a/ReactCommon/jschelpers/systemJSCWrapper.cpp b/ReactCommon/jschelpers/systemJSCWrapper.cpp
index e050468b43f805..45e0597efe8173 100644
--- a/ReactCommon/jschelpers/systemJSCWrapper.cpp
+++ b/ReactCommon/jschelpers/systemJSCWrapper.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <jschelpers/JSCWrapper.h>
@@ -121,6 +119,7 @@ const JSCWrapper* systemJSCWrapper() {
       .JSValueToObject = JSValueToObject,
       .JSValueToStringCopy = JSValueToStringCopy,
       .JSValueUnprotect = JSValueUnprotect,
+      .JSValueIsNull = JSValueIsNull,
 
       .JSSamplingProfilerEnabled = JSSamplingProfilerEnabled,
       .JSPokeSamplingProfiler =
diff --git a/ReactCommon/jsinspector/InspectorInterfaces.cpp b/ReactCommon/jsinspector/InspectorInterfaces.cpp
index f1fa2ed57a684e..326495d031162a 100644
--- a/ReactCommon/jsinspector/InspectorInterfaces.cpp
+++ b/ReactCommon/jsinspector/InspectorInterfaces.cpp
@@ -1,16 +1,15 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "InspectorInterfaces.h"
 
 #include <mutex>
 #include <unordered_map>
+#include <tuple>
 
 namespace facebook {
 namespace react {
@@ -27,7 +26,7 @@ namespace {
 
 class InspectorImpl : public IInspector {
  public:
-  int addPage(const std::string& title, ConnectFunc connectFunc) override;
+  int addPage(const std::string& title, const std::string& vm, ConnectFunc connectFunc) override;
   void removePage(int pageId) override;
 
   std::vector<InspectorPage> getPages() const override;
@@ -38,15 +37,15 @@ class InspectorImpl : public IInspector {
  private:
   mutable std::mutex mutex_;
   int nextPageId_{1};
-  std::unordered_map<int, std::string> titles_;
+  std::unordered_map<int, std::tuple<std::string, std::string>> titles_;
   std::unordered_map<int, ConnectFunc> connectFuncs_;
 };
 
-int InspectorImpl::addPage(const std::string& title, ConnectFunc connectFunc) {
+int InspectorImpl::addPage(const std::string& title, const std::string& vm, ConnectFunc connectFunc) {
   std::lock_guard<std::mutex> lock(mutex_);
 
   int pageId = nextPageId_++;
-  titles_[pageId] = title;
+  titles_[pageId] = std::make_tuple(title, vm);
   connectFuncs_[pageId] = std::move(connectFunc);
 
   return pageId;
@@ -64,7 +63,7 @@ std::vector<InspectorPage> InspectorImpl::getPages() const {
 
   std::vector<InspectorPage> inspectorPages;
   for (auto& it : titles_) {
-    inspectorPages.push_back(InspectorPage{it.first, it.second});
+    inspectorPages.push_back(InspectorPage{it.first, std::get<0>(it.second), std::get<1>(it.second)});
   }
 
   return inspectorPages;
diff --git a/ReactCommon/jsinspector/InspectorInterfaces.h b/ReactCommon/jsinspector/InspectorInterfaces.h
index 0222501f3a043c..c37c2d574d2ff8 100644
--- a/ReactCommon/jsinspector/InspectorInterfaces.h
+++ b/ReactCommon/jsinspector/InspectorInterfaces.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
@@ -25,6 +23,7 @@ class IDestructible {
 struct InspectorPage {
   const int id;
   const std::string title;
+  const std::string vm;
 };
 
 /// IRemoteConnection allows the VM to send debugger messages to the client.
@@ -52,7 +51,7 @@ class IInspector : public IDestructible {
   virtual ~IInspector() = 0;
 
   /// addPage is called by the VM to add a page to the list of debuggable pages.
-  virtual int addPage(const std::string& title, ConnectFunc connectFunc) = 0;
+  virtual int addPage(const std::string& title, const std::string& vm, ConnectFunc connectFunc) = 0;
 
   /// removePage is called by the VM to remove a page from the list of
   /// debuggable pages.
diff --git a/ReactCommon/microprofiler/BUCK b/ReactCommon/microprofiler/BUCK
index 9be4e444e4a2bf..2b05e8e52c0593 100644
--- a/ReactCommon/microprofiler/BUCK
+++ b/ReactCommon/microprofiler/BUCK
@@ -14,6 +14,7 @@ cxx_library(
         "-Werror",
         "-std=c++11",
         "-fexceptions",
+        "-fno-data-sections",
     ],
     force_static = True,
     visibility = [
diff --git a/ReactCommon/yoga/yoga.podspec b/ReactCommon/yoga/yoga.podspec
index 4d0577e80dbec5..c38f4c09796cb6 100644
--- a/ReactCommon/yoga/yoga.podspec
+++ b/ReactCommon/yoga/yoga.podspec
@@ -12,7 +12,7 @@ end
 Pod::Spec.new do |spec|
   spec.name = 'yoga'
   spec.version = "#{version}.React"
-  spec.license =  { :type => 'BSD' }
+  spec.license =  { :type => 'MIT' }
   spec.homepage = 'https://facebook.github.io/yoga/'
   spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/c/'
 
diff --git a/ReactCommon/yoga/yoga/Utils.cpp b/ReactCommon/yoga/yoga/Utils.cpp
index d7f548e61685ea..412845723b22b1 100644
--- a/ReactCommon/yoga/yoga/Utils.cpp
+++ b/ReactCommon/yoga/yoga/Utils.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Utils.h"
@@ -17,15 +15,37 @@ YGFlexDirection YGFlexDirectionCross(
       : YGFlexDirectionColumn;
 }
 
+float YGFloatMax(const float a, const float b) {
+  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+    return fmaxf(a, b);
+  }
+  return YGFloatIsUndefined(a) ? b : a;
+}
+
+float YGFloatMin(const float a, const float b) {
+  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+    return fminf(a, b);
+  }
+
+  return YGFloatIsUndefined(a) ? b : a;
+}
+
 bool YGValueEqual(const YGValue a, const YGValue b) {
   if (a.unit != b.unit) {
     return false;
   }
 
   if (a.unit == YGUnitUndefined ||
-      (std::isnan(a.value) && std::isnan(b.value))) {
+      (YGFloatIsUndefined(a.value) && YGFloatIsUndefined(b.value))) {
     return true;
   }
 
   return fabs(a.value - b.value) < 0.0001f;
 }
+
+bool YGFloatsEqual(const float a, const float b) {
+  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+    return fabs(a - b) < 0.0001f;
+  }
+  return YGFloatIsUndefined(a) && YGFloatIsUndefined(b);
+}
diff --git a/ReactCommon/yoga/yoga/Utils.h b/ReactCommon/yoga/yoga/Utils.h
index 431fe315facb53..6ebeb86fc6b2b5 100644
--- a/ReactCommon/yoga/yoga/Utils.h
+++ b/ReactCommon/yoga/yoga/Utils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
@@ -56,6 +54,38 @@ struct YGCollectFlexItemsRowValues {
 
 bool YGValueEqual(const YGValue a, const YGValue b);
 
+// This custom float equality function returns true if either absolute
+// difference between two floats is less than 0.0001f or both are undefined.
+bool YGFloatsEqual(const float a, const float b);
+
+// We need custom max function, since we want that, if one argument is
+// YGUndefined then the max funtion should return the other argument as the max
+// value. We wouldn't have needed a custom max function if YGUndefined was NAN
+// as fmax has the same behaviour, but with NAN we cannot use `-ffast-math`
+// compiler flag.
+float YGFloatMax(const float a, const float b);
+
+// We need custom min function, since we want that, if one argument is
+// YGUndefined then the min funtion should return the other argument as the min
+// value. We wouldn't have needed a custom min function if YGUndefined was NAN
+// as fmin has the same behaviour, but with NAN we cannot use `-ffast-math`
+// compiler flag.
+float YGFloatMin(const float a, const float b);
+
+// This custom float comparision function compares the array of float with
+// YGFloatsEqual, as the default float comparision operator will not work(Look
+// at the comments of YGFloatsEqual function).
+template <std::size_t size>
+bool YGFloatArrayEqual(
+    const std::array<float, size>& val1,
+    const std::array<float, size>& val2) {
+  bool areEqual = true;
+  for (std::size_t i = 0; i < size && areEqual; ++i) {
+    areEqual = YGFloatsEqual(val1[i], val2[i]);
+  }
+  return areEqual;
+}
+
 YGFlexDirection YGFlexDirectionCross(
     const YGFlexDirection flexDirection,
     const YGDirection direction);
@@ -73,7 +103,7 @@ inline float YGResolveValue(const YGValue value, const float parentSize) {
     case YGUnitPoint:
       return value.value;
     case YGUnitPercent:
-      return value.value * parentSize / 100.0f;
+      return value.value * parentSize * 0.01;
   }
   return YGUndefined;
 }
diff --git a/ReactCommon/yoga/yoga/YGEnums.cpp b/ReactCommon/yoga/yoga/YGEnums.cpp
index af3c27cf387471..7f16628ce14910 100644
--- a/ReactCommon/yoga/yoga/YGEnums.cpp
+++ b/ReactCommon/yoga/yoga/YGEnums.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "YGEnums.h"
diff --git a/ReactCommon/yoga/yoga/YGEnums.h b/ReactCommon/yoga/yoga/YGEnums.h
index 89567b162ab6f2..0976d78d947923 100644
--- a/ReactCommon/yoga/yoga/YGEnums.h
+++ b/ReactCommon/yoga/yoga/YGEnums.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactCommon/yoga/yoga/YGLayout.cpp b/ReactCommon/yoga/yoga/YGLayout.cpp
new file mode 100644
index 00000000000000..4d798476ab18f6
--- /dev/null
+++ b/ReactCommon/yoga/yoga/YGLayout.cpp
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "YGLayout.h"
+#include "Utils.h"
+
+const std::array<float, 2> kYGDefaultDimensionValues = {
+    {YGUndefined, YGUndefined}};
+
+YGLayout::YGLayout()
+    : position(),
+      dimensions(kYGDefaultDimensionValues),
+      margin(),
+      border(),
+      padding(),
+      direction(YGDirectionInherit),
+      computedFlexBasisGeneration(0),
+      computedFlexBasis(YGUndefined),
+      hadOverflow(false),
+      generationCount(0),
+      lastParentDirection((YGDirection)-1),
+      nextCachedMeasurementsIndex(0),
+      cachedMeasurements(),
+      measuredDimensions(kYGDefaultDimensionValues),
+      cachedLayout(YGCachedMeasurement()),
+      didUseLegacyFlag(false),
+      doesLegacyStretchFlagAffectsLayout(false) {}
+
+bool YGLayout::operator==(YGLayout layout) const {
+  bool isEqual = YGFloatArrayEqual(position, layout.position) &&
+      YGFloatArrayEqual(dimensions, layout.dimensions) &&
+      YGFloatArrayEqual(margin, layout.margin) &&
+      YGFloatArrayEqual(border, layout.border) &&
+      YGFloatArrayEqual(padding, layout.padding) &&
+      direction == layout.direction && hadOverflow == layout.hadOverflow &&
+      lastParentDirection == layout.lastParentDirection &&
+      nextCachedMeasurementsIndex == layout.nextCachedMeasurementsIndex &&
+      cachedLayout == layout.cachedLayout;
+
+  for (uint32_t i = 0; i < YG_MAX_CACHED_RESULT_COUNT && isEqual; ++i) {
+    isEqual = isEqual && cachedMeasurements[i] == layout.cachedMeasurements[i];
+  }
+
+  if (!YGFloatIsUndefined(computedFlexBasis) ||
+      !YGFloatIsUndefined(layout.computedFlexBasis)) {
+    isEqual = isEqual && (computedFlexBasis == layout.computedFlexBasis);
+  }
+  if (!YGFloatIsUndefined(measuredDimensions[0]) ||
+      !YGFloatIsUndefined(layout.measuredDimensions[0])) {
+    isEqual =
+        isEqual && (measuredDimensions[0] == layout.measuredDimensions[0]);
+  }
+  if (!YGFloatIsUndefined(measuredDimensions[1]) ||
+      !YGFloatIsUndefined(layout.measuredDimensions[1])) {
+    isEqual =
+        isEqual && (measuredDimensions[1] == layout.measuredDimensions[1]);
+  }
+
+  return isEqual;
+}
+
+bool YGLayout::operator!=(YGLayout layout) const {
+  return !(*this == layout);
+}
diff --git a/ReactCommon/yoga/yoga/YGLayout.h b/ReactCommon/yoga/yoga/YGLayout.h
new file mode 100644
index 00000000000000..cfe559f64bc170
--- /dev/null
+++ b/ReactCommon/yoga/yoga/YGLayout.h
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+#include "Yoga-internal.h"
+
+struct YGLayout {
+  std::array<float, 4> position;
+  std::array<float, 2> dimensions;
+  std::array<float, 6> margin;
+  std::array<float, 6> border;
+  std::array<float, 6> padding;
+  YGDirection direction;
+
+  uint32_t computedFlexBasisGeneration;
+  float computedFlexBasis;
+  bool hadOverflow;
+
+  // Instead of recomputing the entire layout every single time, we
+  // cache some information to break early when nothing changed
+  uint32_t generationCount;
+  YGDirection lastParentDirection;
+
+  uint32_t nextCachedMeasurementsIndex;
+  std::array<YGCachedMeasurement, YG_MAX_CACHED_RESULT_COUNT>
+      cachedMeasurements;
+  std::array<float, 2> measuredDimensions;
+
+  YGCachedMeasurement cachedLayout;
+  bool didUseLegacyFlag;
+  bool doesLegacyStretchFlagAffectsLayout;
+
+  YGLayout();
+
+  bool operator==(YGLayout layout) const;
+  bool operator!=(YGLayout layout) const;
+};
diff --git a/ReactCommon/yoga/yoga/YGMacros.h b/ReactCommon/yoga/yoga/YGMacros.h
index 2b9c5193ec8abb..15ed81d3820a2d 100644
--- a/ReactCommon/yoga/yoga/YGMacros.h
+++ b/ReactCommon/yoga/yoga/YGMacros.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp
index d9a8448094f08a..ae7fce26e8ce3a 100644
--- a/ReactCommon/yoga/yoga/YGNode.cpp
+++ b/ReactCommon/yoga/yoga/YGNode.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "YGNode.h"
@@ -384,8 +382,8 @@ YGNode::YGNode()
       measure_(nullptr),
       baseline_(nullptr),
       dirtied_(nullptr),
-      style_(gYGNodeStyleDefaults),
-      layout_(gYGNodeLayoutDefaults),
+      style_(YGStyle()),
+      layout_(YGLayout()),
       lineIndex_(0),
       parent_(nullptr),
       children_(YGVector()),
@@ -626,26 +624,28 @@ bool YGNode::isNodeFlexible() {
 float YGNode::getLeadingBorder(const YGFlexDirection axis) {
   if (YGFlexDirectionIsRow(axis) &&
       style_.border[YGEdgeStart].unit != YGUnitUndefined &&
+      !YGFloatIsUndefined(style_.border[YGEdgeStart].value) &&
       style_.border[YGEdgeStart].value >= 0.0f) {
     return style_.border[YGEdgeStart].value;
   }
 
-  return fmaxf(
-      YGComputedEdgeValue(style_.border, leading[axis], &YGValueZero)->value,
-      0.0f);
+  float computedEdgeValue =
+      YGComputedEdgeValue(style_.border, leading[axis], &YGValueZero)->value;
+  return YGFloatMax(computedEdgeValue, 0.0f);
 }
 
 float YGNode::getTrailingBorder(const YGFlexDirection flexDirection) {
   if (YGFlexDirectionIsRow(flexDirection) &&
       style_.border[YGEdgeEnd].unit != YGUnitUndefined &&
+      !YGFloatIsUndefined(style_.border[YGEdgeEnd].value) &&
       style_.border[YGEdgeEnd].value >= 0.0f) {
     return style_.border[YGEdgeEnd].value;
   }
 
-  return fmaxf(
+  float computedEdgeValue =
       YGComputedEdgeValue(style_.border, trailing[flexDirection], &YGValueZero)
-          ->value,
-      0.0f);
+          ->value;
+  return YGFloatMax(computedEdgeValue, 0.0f);
 }
 
 float YGNode::getLeadingPadding(
@@ -653,14 +653,16 @@ float YGNode::getLeadingPadding(
     const float widthSize) {
   if (YGFlexDirectionIsRow(axis) &&
       style_.padding[YGEdgeStart].unit != YGUnitUndefined &&
-      YGResolveValue(style_.padding[YGEdgeStart], widthSize) >= 0.0f) {
+      !YGFloatIsUndefined(
+          YGResolveValue(style_.padding[YGEdgeStart], widthSize)) &&
+      YGResolveValue(style_.padding[YGEdgeStart], widthSize) > 0.0f) {
     return YGResolveValue(style_.padding[YGEdgeStart], widthSize);
   }
-  return fmaxf(
-      YGResolveValue(
-          *YGComputedEdgeValue(style_.padding, leading[axis], &YGValueZero),
-          widthSize),
-      0.0f);
+
+  float resolvedValue = YGResolveValue(
+      *YGComputedEdgeValue(style_.padding, leading[axis], &YGValueZero),
+      widthSize);
+  return YGFloatMax(resolvedValue, 0.0f);
 }
 
 float YGNode::getTrailingPadding(
@@ -668,14 +670,17 @@ float YGNode::getTrailingPadding(
     const float widthSize) {
   if (YGFlexDirectionIsRow(axis) &&
       style_.padding[YGEdgeEnd].unit != YGUnitUndefined &&
+      !YGFloatIsUndefined(
+          YGResolveValue(style_.padding[YGEdgeEnd], widthSize)) &&
       YGResolveValue(style_.padding[YGEdgeEnd], widthSize) >= 0.0f) {
     return YGResolveValue(style_.padding[YGEdgeEnd], widthSize);
   }
-  return fmaxf(
-      YGResolveValue(
-          *YGComputedEdgeValue(style_.padding, trailing[axis], &YGValueZero),
-          widthSize),
-      0.0f);
+
+  float resolvedValue = YGResolveValue(
+      *YGComputedEdgeValue(style_.padding, trailing[axis], &YGValueZero),
+      widthSize);
+
+  return YGFloatMax(resolvedValue, 0.0f);
 }
 
 float YGNode::getLeadingPaddingAndBorder(
diff --git a/ReactCommon/yoga/yoga/YGNode.h b/ReactCommon/yoga/yoga/YGNode.h
index 512b3baa9bee25..27a1ed68fac113 100644
--- a/ReactCommon/yoga/yoga/YGNode.h
+++ b/ReactCommon/yoga/yoga/YGNode.h
@@ -1,15 +1,14 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
 #include <stdio.h>
-
+#include "YGLayout.h"
+#include "YGStyle.h"
 #include "Yoga-internal.h"
 
 struct YGNode {
diff --git a/ReactCommon/yoga/yoga/YGNodePrint.cpp b/ReactCommon/yoga/yoga/YGNodePrint.cpp
index 6e5047145aba45..395fe1819ad067 100644
--- a/ReactCommon/yoga/yoga/YGNodePrint.cpp
+++ b/ReactCommon/yoga/yoga/YGNodePrint.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "YGNodePrint.h"
diff --git a/ReactCommon/yoga/yoga/YGNodePrint.h b/ReactCommon/yoga/yoga/YGNodePrint.h
index 18942b7bfd19a6..16259fcff7cf8e 100644
--- a/ReactCommon/yoga/yoga/YGNodePrint.h
+++ b/ReactCommon/yoga/yoga/YGNodePrint.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 #pragma once
 #include <string>
diff --git a/ReactCommon/yoga/yoga/YGStyle.cpp b/ReactCommon/yoga/yoga/YGStyle.cpp
new file mode 100644
index 00000000000000..f3bc16fe1cc21b
--- /dev/null
+++ b/ReactCommon/yoga/yoga/YGStyle.cpp
@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "YGStyle.h"
+
+const YGValue kYGValueUndefined = {YGUndefined, YGUnitUndefined};
+
+const YGValue kYGValueAuto = {YGUndefined, YGUnitAuto};
+
+const std::array<YGValue, YGEdgeCount> kYGDefaultEdgeValuesUnit = {
+    {kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined}};
+
+const std::array<YGValue, 2> kYGDefaultDimensionValuesAutoUnit = {
+    {kYGValueAuto, kYGValueAuto}};
+
+const std::array<YGValue, 2> kYGDefaultDimensionValuesUnit = {
+    {kYGValueUndefined, kYGValueUndefined}};
+
+YGStyle::YGStyle()
+    : direction(YGDirectionInherit),
+      flexDirection(YGFlexDirectionColumn),
+      justifyContent(YGJustifyFlexStart),
+      alignContent(YGAlignFlexStart),
+      alignItems(YGAlignStretch),
+      alignSelf(YGAlignAuto),
+      positionType(YGPositionTypeRelative),
+      flexWrap(YGWrapNoWrap),
+      overflow(YGOverflowVisible),
+      display(YGDisplayFlex),
+      flex(YGUndefined),
+      flexGrow(YGUndefined),
+      flexShrink(YGUndefined),
+      flexBasis(kYGValueAuto),
+      margin(kYGDefaultEdgeValuesUnit),
+      position(kYGDefaultEdgeValuesUnit),
+      padding(kYGDefaultEdgeValuesUnit),
+      border(kYGDefaultEdgeValuesUnit),
+      dimensions(kYGDefaultDimensionValuesAutoUnit),
+      minDimensions(kYGDefaultDimensionValuesUnit),
+      maxDimensions(kYGDefaultDimensionValuesUnit),
+      aspectRatio(YGUndefined) {}
+
+// Yoga specific properties, not compatible with flexbox specification
+bool YGStyle::operator==(const YGStyle& style) {
+  bool areNonFloatValuesEqual = direction == style.direction &&
+      flexDirection == style.flexDirection &&
+      justifyContent == style.justifyContent &&
+      alignContent == style.alignContent && alignItems == style.alignItems &&
+      alignSelf == style.alignSelf && positionType == style.positionType &&
+      flexWrap == style.flexWrap && overflow == style.overflow &&
+      display == style.display && YGValueEqual(flexBasis, style.flexBasis) &&
+      YGValueArrayEqual(margin, style.margin) &&
+      YGValueArrayEqual(position, style.position) &&
+      YGValueArrayEqual(padding, style.padding) &&
+      YGValueArrayEqual(border, style.border) &&
+      YGValueArrayEqual(dimensions, style.dimensions) &&
+      YGValueArrayEqual(minDimensions, style.minDimensions) &&
+      YGValueArrayEqual(maxDimensions, style.maxDimensions);
+
+  if (!(YGFloatIsUndefined(flex) && YGFloatIsUndefined(style.flex))) {
+    areNonFloatValuesEqual = areNonFloatValuesEqual && flex == style.flex;
+  }
+
+  if (!(YGFloatIsUndefined(flexGrow) && YGFloatIsUndefined(style.flexGrow))) {
+    areNonFloatValuesEqual =
+        areNonFloatValuesEqual && flexGrow == style.flexGrow;
+  }
+
+  if (!(YGFloatIsUndefined(flexShrink) &&
+        YGFloatIsUndefined(style.flexShrink))) {
+    areNonFloatValuesEqual =
+        areNonFloatValuesEqual && flexShrink == style.flexShrink;
+  }
+
+  if (!(YGFloatIsUndefined(aspectRatio) &&
+        YGFloatIsUndefined(style.aspectRatio))) {
+    areNonFloatValuesEqual =
+        areNonFloatValuesEqual && aspectRatio == style.aspectRatio;
+  }
+
+  return areNonFloatValuesEqual;
+}
+
+bool YGStyle::operator!=(YGStyle style) {
+  return !(*this == style);
+}
+
+YGStyle::~YGStyle() {}
diff --git a/ReactCommon/yoga/yoga/YGStyle.h b/ReactCommon/yoga/yoga/YGStyle.h
new file mode 100644
index 00000000000000..74b9d6e0baa367
--- /dev/null
+++ b/ReactCommon/yoga/yoga/YGStyle.h
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+#include "Yoga-internal.h"
+#include "Yoga.h"
+
+struct YGStyle {
+  YGDirection direction;
+  YGFlexDirection flexDirection;
+  YGJustify justifyContent;
+  YGAlign alignContent;
+  YGAlign alignItems;
+  YGAlign alignSelf;
+  YGPositionType positionType;
+  YGWrap flexWrap;
+  YGOverflow overflow;
+  YGDisplay display;
+  float flex;
+  float flexGrow;
+  float flexShrink;
+  YGValue flexBasis;
+  std::array<YGValue, YGEdgeCount> margin;
+  std::array<YGValue, YGEdgeCount> position;
+  std::array<YGValue, YGEdgeCount> padding;
+  std::array<YGValue, YGEdgeCount> border;
+  std::array<YGValue, 2> dimensions;
+  std::array<YGValue, 2> minDimensions;
+  std::array<YGValue, 2> maxDimensions;
+  float aspectRatio;
+
+  YGStyle();
+  // Yoga specific properties, not compatible with flexbox specification
+  bool operator==(const YGStyle& style);
+
+  bool operator!=(YGStyle style);
+  ~YGStyle();
+};
diff --git a/ReactCommon/yoga/yoga/Yoga-internal.h b/ReactCommon/yoga/yoga/Yoga-internal.h
index 923e5a897744df..56078d6c3f06bc 100644
--- a/ReactCommon/yoga/yoga/Yoga-internal.h
+++ b/ReactCommon/yoga/yoga/Yoga-internal.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
@@ -12,7 +10,6 @@
 #include <array>
 #include <cmath>
 #include <vector>
-
 #include "Yoga.h"
 
 using YGVector = std::vector<YGNodeRef>;
@@ -53,23 +50,32 @@ struct YGCachedMeasurement {
   float computedWidth;
   float computedHeight;
 
+  YGCachedMeasurement()
+      : availableWidth(0),
+        availableHeight(0),
+        widthMeasureMode((YGMeasureMode)-1),
+        heightMeasureMode((YGMeasureMode)-1),
+        computedWidth(-1),
+        computedHeight(-1) {}
+
   bool operator==(YGCachedMeasurement measurement) const {
     bool isEqual = widthMeasureMode == measurement.widthMeasureMode &&
         heightMeasureMode == measurement.heightMeasureMode;
 
-    if (!std::isnan(availableWidth) ||
-        !std::isnan(measurement.availableWidth)) {
+    if (!YGFloatIsUndefined(availableWidth) ||
+        !YGFloatIsUndefined(measurement.availableWidth)) {
       isEqual = isEqual && availableWidth == measurement.availableWidth;
     }
-    if (!std::isnan(availableHeight) ||
-        !std::isnan(measurement.availableHeight)) {
+    if (!YGFloatIsUndefined(availableHeight) ||
+        !YGFloatIsUndefined(measurement.availableHeight)) {
       isEqual = isEqual && availableHeight == measurement.availableHeight;
     }
-    if (!std::isnan(computedWidth) || !std::isnan(measurement.computedWidth)) {
+    if (!YGFloatIsUndefined(computedWidth) ||
+        !YGFloatIsUndefined(measurement.computedWidth)) {
       isEqual = isEqual && computedWidth == measurement.computedWidth;
     }
-    if (!std::isnan(computedHeight) ||
-        !std::isnan(measurement.computedHeight)) {
+    if (!YGFloatIsUndefined(computedHeight) ||
+        !YGFloatIsUndefined(measurement.computedHeight)) {
       isEqual = isEqual && computedHeight == measurement.computedHeight;
     }
 
@@ -81,136 +87,6 @@ struct YGCachedMeasurement {
 // layouts should not require more than 16 entries to fit within the cache.
 #define YG_MAX_CACHED_RESULT_COUNT 16
 
-struct YGLayout {
-  std::array<float, 4> position;
-  std::array<float, 2> dimensions;
-  std::array<float, 6> margin;
-  std::array<float, 6> border;
-  std::array<float, 6> padding;
-  YGDirection direction;
-
-  uint32_t computedFlexBasisGeneration;
-  float computedFlexBasis;
-  bool hadOverflow;
-
-  // Instead of recomputing the entire layout every single time, we
-  // cache some information to break early when nothing changed
-  uint32_t generationCount;
-  YGDirection lastParentDirection;
-
-  uint32_t nextCachedMeasurementsIndex;
-  YGCachedMeasurement cachedMeasurements[YG_MAX_CACHED_RESULT_COUNT];
-  std::array<float, 2> measuredDimensions;
-
-  YGCachedMeasurement cachedLayout;
-  bool didUseLegacyFlag;
-  bool doesLegacyStretchFlagAffectsLayout;
-
-  bool operator==(YGLayout layout) const {
-    bool isEqual = position == layout.position &&
-        dimensions == layout.dimensions && margin == layout.margin &&
-        border == layout.border && padding == layout.padding &&
-        direction == layout.direction && hadOverflow == layout.hadOverflow &&
-        lastParentDirection == layout.lastParentDirection &&
-        nextCachedMeasurementsIndex == layout.nextCachedMeasurementsIndex &&
-        cachedLayout == layout.cachedLayout;
-
-    for (uint32_t i = 0; i < YG_MAX_CACHED_RESULT_COUNT && isEqual; ++i) {
-      isEqual =
-          isEqual && cachedMeasurements[i] == layout.cachedMeasurements[i];
-    }
-
-    if (!YGFloatIsUndefined(computedFlexBasis) ||
-        !YGFloatIsUndefined(layout.computedFlexBasis)) {
-      isEqual = isEqual && (computedFlexBasis == layout.computedFlexBasis);
-    }
-    if (!YGFloatIsUndefined(measuredDimensions[0]) ||
-        !YGFloatIsUndefined(layout.measuredDimensions[0])) {
-      isEqual =
-          isEqual && (measuredDimensions[0] == layout.measuredDimensions[0]);
-    }
-    if (!YGFloatIsUndefined(measuredDimensions[1]) ||
-        !YGFloatIsUndefined(layout.measuredDimensions[1])) {
-      isEqual =
-          isEqual && (measuredDimensions[1] == layout.measuredDimensions[1]);
-    }
-
-    return isEqual;
-  }
-
-  bool operator!=(YGLayout layout) const {
-    return !(*this == layout);
-  }
-};
-
-struct YGStyle {
-  YGDirection direction;
-  YGFlexDirection flexDirection;
-  YGJustify justifyContent;
-  YGAlign alignContent;
-  YGAlign alignItems;
-  YGAlign alignSelf;
-  YGPositionType positionType;
-  YGWrap flexWrap;
-  YGOverflow overflow;
-  YGDisplay display;
-  float flex;
-  float flexGrow;
-  float flexShrink;
-  YGValue flexBasis;
-  std::array<YGValue, YGEdgeCount> margin;
-  std::array<YGValue, YGEdgeCount> position;
-  std::array<YGValue, YGEdgeCount> padding;
-  std::array<YGValue, YGEdgeCount> border;
-  std::array<YGValue, 2> dimensions;
-  std::array<YGValue, 2> minDimensions;
-  std::array<YGValue, 2> maxDimensions;
-
-  // Yoga specific properties, not compatible with flexbox specification
-  float aspectRatio;
-  bool operator==(YGStyle style) {
-    bool areNonFloatValuesEqual = direction == style.direction &&
-        flexDirection == style.flexDirection &&
-        justifyContent == style.justifyContent &&
-        alignContent == style.alignContent && alignItems == style.alignItems &&
-        alignSelf == style.alignSelf && positionType == style.positionType &&
-        flexWrap == style.flexWrap && overflow == style.overflow &&
-        display == style.display && YGValueEqual(flexBasis, style.flexBasis) &&
-        YGValueArrayEqual(margin, style.margin) &&
-        YGValueArrayEqual(position, style.position) &&
-        YGValueArrayEqual(padding, style.padding) &&
-        YGValueArrayEqual(border, style.border) &&
-        YGValueArrayEqual(dimensions, style.dimensions) &&
-        YGValueArrayEqual(minDimensions, style.minDimensions) &&
-        YGValueArrayEqual(maxDimensions, style.maxDimensions);
-
-    if (!(std::isnan(flex) && std::isnan(style.flex))) {
-      areNonFloatValuesEqual = areNonFloatValuesEqual && flex == style.flex;
-    }
-
-    if (!(std::isnan(flexGrow) && std::isnan(style.flexGrow))) {
-      areNonFloatValuesEqual =
-          areNonFloatValuesEqual && flexGrow == style.flexGrow;
-    }
-
-    if (!(std::isnan(flexShrink) && std::isnan(style.flexShrink))) {
-      areNonFloatValuesEqual =
-          areNonFloatValuesEqual && flexShrink == style.flexShrink;
-    }
-
-    if (!(std::isnan(aspectRatio) && std::isnan(style.aspectRatio))) {
-      areNonFloatValuesEqual =
-          areNonFloatValuesEqual && aspectRatio == style.aspectRatio;
-    }
-
-    return areNonFloatValuesEqual;
-  }
-
-  bool operator!=(YGStyle style) {
-    return !(*this == style);
-  }
-};
-
 struct YGConfig {
   bool experimentalFeatures[YGExperimentalFeatureCount + 1];
   bool useWebDefaults;
@@ -222,122 +98,10 @@ struct YGConfig {
   void* context;
 };
 
-#define YG_UNDEFINED_VALUES \
-  { .value = YGUndefined, .unit = YGUnitUndefined }
-
-#define YG_AUTO_VALUES \
-  { .value = YGUndefined, .unit = YGUnitAuto }
-
-#define YG_DEFAULT_EDGE_VALUES_UNIT                                            \
-  {                                                                            \
-    [YGEdgeLeft] = YG_UNDEFINED_VALUES, [YGEdgeTop] = YG_UNDEFINED_VALUES,     \
-    [YGEdgeRight] = YG_UNDEFINED_VALUES, [YGEdgeBottom] = YG_UNDEFINED_VALUES, \
-    [YGEdgeStart] = YG_UNDEFINED_VALUES, [YGEdgeEnd] = YG_UNDEFINED_VALUES,    \
-    [YGEdgeHorizontal] = YG_UNDEFINED_VALUES,                                  \
-    [YGEdgeVertical] = YG_UNDEFINED_VALUES, [YGEdgeAll] = YG_UNDEFINED_VALUES, \
-  }
-
-#define YG_DEFAULT_DIMENSION_VALUES \
-  { [YGDimensionWidth] = YGUndefined, [YGDimensionHeight] = YGUndefined, }
-
-#define YG_DEFAULT_DIMENSION_VALUES_UNIT       \
-  {                                            \
-    [YGDimensionWidth] = YG_UNDEFINED_VALUES,  \
-    [YGDimensionHeight] = YG_UNDEFINED_VALUES, \
-  }
-
-#define YG_DEFAULT_DIMENSION_VALUES_AUTO_UNIT \
-  { [YGDimensionWidth] = YG_AUTO_VALUES, [YGDimensionHeight] = YG_AUTO_VALUES, }
-
 static const float kDefaultFlexGrow = 0.0f;
 static const float kDefaultFlexShrink = 0.0f;
 static const float kWebDefaultFlexShrink = 1.0f;
 
-static const YGStyle gYGNodeStyleDefaults = {
-    .direction = YGDirectionInherit,
-    .flexDirection = YGFlexDirectionColumn,
-    .justifyContent = YGJustifyFlexStart,
-    .alignContent = YGAlignFlexStart,
-    .alignItems = YGAlignStretch,
-    .alignSelf = YGAlignAuto,
-    .positionType = YGPositionTypeRelative,
-    .flexWrap = YGWrapNoWrap,
-    .overflow = YGOverflowVisible,
-    .display = YGDisplayFlex,
-    .flex = YGUndefined,
-    .flexGrow = YGUndefined,
-    .flexShrink = YGUndefined,
-    .flexBasis = YG_AUTO_VALUES,
-    .margin = {{YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES}},
-    .position = {{YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES}},
-    .padding = {{YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES}},
-    .border = {{YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES}},
-    .dimensions = {{YG_AUTO_VALUES, YG_AUTO_VALUES}},
-    .minDimensions = {{YG_UNDEFINED_VALUES, YG_UNDEFINED_VALUES}},
-    .maxDimensions = {{YG_UNDEFINED_VALUES, YG_UNDEFINED_VALUES}},
-    .aspectRatio = YGUndefined,
-};
-
-static const YGLayout gYGNodeLayoutDefaults = {
-    .position = {},
-    .dimensions = {{YGUndefined, YGUndefined}},
-    .margin = {},
-    .border = {},
-    .padding = {},
-    .direction = YGDirectionInherit,
-    .computedFlexBasisGeneration = 0,
-    .computedFlexBasis = YGUndefined,
-    .hadOverflow = false,
-    .generationCount = 0,
-    .lastParentDirection = (YGDirection)-1,
-    .nextCachedMeasurementsIndex = 0,
-    .cachedMeasurements = {},
-    .measuredDimensions = {{YGUndefined, YGUndefined}},
-    .cachedLayout =
-        {
-            .availableWidth = 0,
-            .availableHeight = 0,
-            .widthMeasureMode = (YGMeasureMode)-1,
-            .heightMeasureMode = (YGMeasureMode)-1,
-            .computedWidth = -1,
-            .computedHeight = -1,
-        },
-    .didUseLegacyFlag = false,
-    .doesLegacyStretchFlagAffectsLayout = false,
-};
-
 extern bool YGFloatsEqual(const float a, const float b);
 extern bool YGValueEqual(const YGValue a, const YGValue b);
 extern const YGValue* YGComputedEdgeValue(
diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
index 63b00c6cc8a586..41f89e877e4caa 100644
--- a/ReactCommon/yoga/yoga/Yoga.cpp
+++ b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Yoga.h"
@@ -21,7 +19,10 @@
 /* define fmaxf if < VC12 */
 #if _MSC_VER < 1800
 __forceinline const float fmaxf(const float a, const float b) {
-  return (a > b) ? a : b;
+  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+    return (a > b) ? a : b;
+  }
+  return YGFloatIsUndefined(a) ? b : a;
 }
 #endif
 #endif
@@ -120,7 +121,15 @@ static int YGDefaultLog(const YGConfigRef config,
 #endif
 
 bool YGFloatIsUndefined(const float value) {
-  return std::isnan(value);
+  // Value of a float in the case of it being not defined is 10.1E20. Earlier
+  // it used to be NAN, the benefit of which was that if NAN is involved in any
+  // mathematical expression the result was NAN. But since we want to have
+  // `-ffast-math` flag being used by compiler which assumes that the floating
+  // point values are not NAN and Inf, we represent YGUndefined as 10.1E20. But
+  // now if YGUndefined is involved in any mathematical operations this
+  // value(10.1E20) would change. So the following check makes sure that if the
+  // value is outside a range (-10E8, 10E8) then it is undefined.
+  return value >= 10E8 || value <= -10E8;
 }
 
 const YGValue* YGComputedEdgeValue(
@@ -790,13 +799,6 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
                           const char *reason,
                           const YGConfigRef config);
 
-bool YGFloatsEqual(const float a, const float b) {
-  if (YGFloatIsUndefined(a)) {
-    return YGFloatIsUndefined(b);
-  }
-  return fabs(a - b) < 0.0001f;
-}
-
 static void YGNodePrintInternal(const YGNodeRef node,
                                 const YGPrintOptions options) {
   std::string str;
@@ -911,12 +913,15 @@ static inline float YGNodeDimWithMargin(const YGNodeRef node,
 static inline bool YGNodeIsStyleDimDefined(const YGNodeRef node,
                                            const YGFlexDirection axis,
                                            const float parentSize) {
+  bool isUndefined =
+      YGFloatIsUndefined(node->getResolvedDimension(dim[axis]).value);
   return !(
       node->getResolvedDimension(dim[axis]).unit == YGUnitAuto ||
       node->getResolvedDimension(dim[axis]).unit == YGUnitUndefined ||
       (node->getResolvedDimension(dim[axis]).unit == YGUnitPoint &&
-       node->getResolvedDimension(dim[axis]).value < 0.0f) ||
+       !isUndefined && node->getResolvedDimension(dim[axis]).value < 0.0f) ||
       (node->getResolvedDimension(dim[axis]).unit == YGUnitPercent &&
+       !isUndefined &&
        (node->getResolvedDimension(dim[axis]).value < 0.0f ||
         YGFloatIsUndefined(parentSize))));
 }
@@ -966,8 +971,9 @@ static inline float YGNodeBoundAxis(const YGNodeRef node,
                                     const float value,
                                     const float axisSize,
                                     const float widthSize) {
-  return fmaxf(YGNodeBoundAxisWithinMinAndMax(node, axis, value, axisSize),
-               YGNodePaddingAndBorderForAxis(node, axis, widthSize));
+  return YGFloatMax(
+      YGNodeBoundAxisWithinMinAndMax(node, axis, value, axisSize),
+      YGNodePaddingAndBorderForAxis(node, axis, widthSize));
 }
 
 static void YGNodeSetChildTrailingPosition(const YGNodeRef node,
@@ -1037,19 +1043,19 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
              child->getConfig(), YGExperimentalFeatureWebFlexBasis) &&
          child->getLayout().computedFlexBasisGeneration !=
              gCurrentGenerationCount)) {
-      child->setLayoutComputedFlexBasis(fmaxf(
+      child->setLayoutComputedFlexBasis(YGFloatMax(
           resolvedFlexBasis,
           YGNodePaddingAndBorderForAxis(child, mainAxis, parentWidth)));
     }
   } else if (isMainAxisRow && isRowStyleDimDefined) {
     // The width is definite, so use that as the flex basis.
-    child->setLayoutComputedFlexBasis(fmaxf(
+    child->setLayoutComputedFlexBasis(YGFloatMax(
         YGResolveValue(
             child->getResolvedDimension(YGDimensionWidth), parentWidth),
         YGNodePaddingAndBorderForAxis(child, YGFlexDirectionRow, parentWidth)));
   } else if (!isMainAxisRow && isColumnStyleDimDefined) {
     // The height is definite, so use that as the flex basis.
-    child->setLayoutComputedFlexBasis(fmaxf(
+    child->setLayoutComputedFlexBasis(YGFloatMax(
         YGResolveValue(
             child->getResolvedDimension(YGDimensionHeight), parentHeight),
         YGNodePaddingAndBorderForAxis(
@@ -1102,10 +1108,11 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
 
     if (!YGFloatIsUndefined(child->getStyle().aspectRatio)) {
       if (!isMainAxisRow && childWidthMeasureMode == YGMeasureModeExactly) {
-        childHeight = (childWidth - marginRow) / child->getStyle().aspectRatio;
+        childHeight = marginColumn +
+            (childWidth - marginRow) / child->getStyle().aspectRatio;
         childHeightMeasureMode = YGMeasureModeExactly;
       } else if (isMainAxisRow && childHeightMeasureMode == YGMeasureModeExactly) {
-        childWidth =
+        childWidth = marginRow +
             (childHeight - marginColumn) * child->getStyle().aspectRatio;
         childWidthMeasureMode = YGMeasureModeExactly;
       }
@@ -1163,7 +1170,7 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
                          "measure",
                          config);
 
-    child->setLayoutComputedFlexBasis(fmaxf(
+    child->setLayoutComputedFlexBasis(YGFloatMax(
         child->getLayout().measuredDimensions[dim[mainAxis]],
         YGNodePaddingAndBorderForAxis(child, mainAxis, parentWidth)));
   }
@@ -1253,7 +1260,8 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
     // If the size of the parent is defined then try to constrain the absolute child to that size
     // as well. This allows text within the absolute child to wrap to the size of its parent.
     // This is the same behavior as many browsers implement.
-    if (!isMainAxisRow && YGFloatIsUndefined(childWidth) && widthMode != YGMeasureModeUndefined &&
+    if (!isMainAxisRow && YGFloatIsUndefined(childWidth) &&
+        widthMode != YGMeasureModeUndefined && !YGFloatIsUndefined(width) &&
         width > 0) {
       childWidth = width;
       childWidthMeasureMode = YGMeasureModeAtMost;
@@ -1369,10 +1377,10 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(const YGNodeRef node,
   // We want to make sure we don't call measure with negative size
   const float innerWidth = YGFloatIsUndefined(availableWidth)
       ? availableWidth
-      : fmaxf(0, availableWidth - marginAxisRow - paddingAndBorderAxisRow);
+      : YGFloatMax(0, availableWidth - marginAxisRow - paddingAndBorderAxisRow);
   const float innerHeight = YGFloatIsUndefined(availableHeight)
       ? availableHeight
-      : fmaxf(
+      : YGFloatMax(
             0, availableHeight - marginAxisColumn - paddingAndBorderAxisColumn);
 
   if (widthMeasureMode == YGMeasureModeExactly &&
@@ -1475,9 +1483,12 @@ static bool YGNodeFixedSizeSetMeasuredDimensions(const YGNodeRef node,
                                                  const YGMeasureMode heightMeasureMode,
                                                  const float parentWidth,
                                                  const float parentHeight) {
-  if ((widthMeasureMode == YGMeasureModeAtMost && availableWidth <= 0.0f) ||
-      (heightMeasureMode == YGMeasureModeAtMost && availableHeight <= 0.0f) ||
-      (widthMeasureMode == YGMeasureModeExactly && heightMeasureMode == YGMeasureModeExactly)) {
+  if ((!YGFloatIsUndefined(availableWidth) &&
+       widthMeasureMode == YGMeasureModeAtMost && availableWidth <= 0.0f) ||
+      (!YGFloatIsUndefined(availableHeight) &&
+       heightMeasureMode == YGMeasureModeAtMost && availableHeight <= 0.0f) ||
+      (widthMeasureMode == YGMeasureModeExactly &&
+       heightMeasureMode == YGMeasureModeExactly)) {
     const float marginAxisColumn =
         node->getMarginForAxis(YGFlexDirectionColumn, parentWidth);
     const float marginAxisRow =
@@ -1546,13 +1557,16 @@ static float YGNodeCalculateAvailableInnerDim(
     // We want to make sure our available height does not violate min and max
     // constraints
     const float minInnerDim =
-        YGResolveValue(node->getStyle().minDimensions[dimension], parentDim) -
-        paddingAndBorder;
+        YGFloatIsUndefined(YGResolveValue(
+            node->getStyle().minDimensions[dimension], parentDim))
+        ? 0.0f
+        : YGResolveValue(node->getStyle().minDimensions[dimension], parentDim) -
+            paddingAndBorder;
     const float maxInnerDim =
         YGResolveValue(node->getStyle().maxDimensions[dimension], parentDim) -
         paddingAndBorder;
     availableInnerDim =
-        fmaxf(fminf(availableInnerDim, maxInnerDim), minInnerDim);
+        YGFloatMax(YGFloatMin(availableInnerDim, maxInnerDim), minInnerDim);
   }
 
   return availableInnerDim;
@@ -1753,14 +1767,17 @@ static float YGDistributeFreeSpaceSecondPass(
         mainAxisParentSize);
     float updatedMainSize = childFlexBasis;
 
-    if (collectedFlexItemsValues.remainingFreeSpace < 0) {
+    if (!YGFloatIsUndefined(collectedFlexItemsValues.remainingFreeSpace) &&
+        collectedFlexItemsValues.remainingFreeSpace < 0) {
       flexShrinkScaledFactor =
           -currentRelativeChild->resolveFlexShrink() * childFlexBasis;
       // Is this child able to shrink?
       if (flexShrinkScaledFactor != 0) {
         float childSize;
 
-        if (collectedFlexItemsValues.totalFlexShrinkScaledFactors == 0) {
+        if (!YGFloatIsUndefined(
+                collectedFlexItemsValues.totalFlexShrinkScaledFactors) &&
+            collectedFlexItemsValues.totalFlexShrinkScaledFactors == 0) {
           childSize = childFlexBasis + flexShrinkScaledFactor;
         } else {
           childSize = childFlexBasis +
@@ -1776,11 +1793,13 @@ static float YGDistributeFreeSpaceSecondPass(
             availableInnerMainDim,
             availableInnerWidth);
       }
-    } else if (collectedFlexItemsValues.remainingFreeSpace > 0) {
+    } else if (
+        !YGFloatIsUndefined(collectedFlexItemsValues.remainingFreeSpace) &&
+        collectedFlexItemsValues.remainingFreeSpace > 0) {
       flexGrowFactor = currentRelativeChild->resolveFlexGrow();
 
       // Is this child able to grow?
-      if (flexGrowFactor != 0) {
+      if (!YGFloatIsUndefined(flexGrowFactor) && flexGrowFactor != 0) {
         updatedMainSize = YGNodeBoundAxis(
             currentRelativeChild,
             mainAxis,
@@ -1927,7 +1946,8 @@ static void YGDistributeFreeSpaceFirstPass(
           -currentRelativeChild->resolveFlexShrink() * childFlexBasis;
 
       // Is this child able to shrink?
-      if (flexShrinkScaledFactor != 0) {
+      if (!YGFloatIsUndefined(flexShrinkScaledFactor) &&
+          flexShrinkScaledFactor != 0) {
         baseMainSize = childFlexBasis +
             collectedFlexItemsValues.remainingFreeSpace /
                 collectedFlexItemsValues.totalFlexShrinkScaledFactors *
@@ -1938,7 +1958,9 @@ static void YGDistributeFreeSpaceFirstPass(
             baseMainSize,
             availableInnerMainDim,
             availableInnerWidth);
-        if (baseMainSize != boundMainSize) {
+        if (!YGFloatIsUndefined(baseMainSize) &&
+            !YGFloatIsUndefined(boundMainSize) &&
+            baseMainSize != boundMainSize) {
           // By excluding this item's size and flex factor from remaining,
           // this item's
           // min/max constraints should also trigger in the second pass
@@ -1950,11 +1972,13 @@ static void YGDistributeFreeSpaceFirstPass(
               flexShrinkScaledFactor;
         }
       }
-    } else if (collectedFlexItemsValues.remainingFreeSpace > 0) {
+    } else if (
+        !YGFloatIsUndefined(collectedFlexItemsValues.remainingFreeSpace) &&
+        collectedFlexItemsValues.remainingFreeSpace > 0) {
       flexGrowFactor = currentRelativeChild->resolveFlexGrow();
 
       // Is this child able to grow?
-      if (flexGrowFactor != 0) {
+      if (!YGFloatIsUndefined(flexGrowFactor) && flexGrowFactor != 0) {
         baseMainSize = childFlexBasis +
             collectedFlexItemsValues.remainingFreeSpace /
                 collectedFlexItemsValues.totalFlexGrowFactors * flexGrowFactor;
@@ -1965,7 +1989,9 @@ static void YGDistributeFreeSpaceFirstPass(
             availableInnerMainDim,
             availableInnerWidth);
 
-        if (baseMainSize != boundMainSize) {
+        if (!YGFloatIsUndefined(baseMainSize) &&
+            !YGFloatIsUndefined(boundMainSize) &&
+            baseMainSize != boundMainSize) {
           // By excluding this item's size and flex factor from remaining,
           // this item's
           // min/max constraints should also trigger in the second pass
@@ -2070,9 +2096,9 @@ static void YGJustifyMainAxis(
   if (measureModeMainDim == YGMeasureModeAtMost &&
       collectedFlexItemsValues.remainingFreeSpace > 0) {
     if (style.minDimensions[dim[mainAxis]].unit != YGUnitUndefined &&
-        YGResolveValue(
-            style.minDimensions[dim[mainAxis]], mainAxisParentSize) >= 0) {
-      collectedFlexItemsValues.remainingFreeSpace = fmaxf(
+        !YGFloatIsUndefined(YGResolveValue(
+            style.minDimensions[dim[mainAxis]], mainAxisParentSize))) {
+      collectedFlexItemsValues.remainingFreeSpace = YGFloatMax(
           0,
           YGResolveValue(
               style.minDimensions[dim[mainAxis]], mainAxisParentSize) -
@@ -2116,7 +2142,7 @@ static void YGJustifyMainAxis(
       case YGJustifySpaceBetween:
         if (collectedFlexItemsValues.itemsOnLine > 1) {
           betweenMainDim =
-              fmaxf(collectedFlexItemsValues.remainingFreeSpace, 0) /
+              YGFloatMax(collectedFlexItemsValues.remainingFreeSpace, 0) /
               (collectedFlexItemsValues.itemsOnLine - 1);
         } else {
           betweenMainDim = 0;
@@ -2208,7 +2234,7 @@ static void YGJustifyMainAxis(
 
           // The cross dimension is the max of the elements dimension since
           // there can only be one element in that cross dimension.
-          collectedFlexItemsValues.crossDim = fmaxf(
+          collectedFlexItemsValues.crossDim = YGFloatMax(
               collectedFlexItemsValues.crossDim,
               YGNodeDimWithMargin(child, crossAxis, availableInnerWidth));
         }
@@ -2538,8 +2564,11 @@ static void YGNodelayoutImpl(const YGNodeRef node,
         availableInnerMainDim = maxInnerMainDim;
       } else {
         if (!node->getConfig()->useLegacyStretchBehaviour &&
-            (collectedFlexItemsValues.totalFlexGrowFactors == 0 ||
-             node->resolveFlexGrow() == 0)) {
+            ((YGFloatIsUndefined(
+                  collectedFlexItemsValues.totalFlexGrowFactors) &&
+              collectedFlexItemsValues.totalFlexGrowFactors == 0) ||
+             (YGFloatIsUndefined(node->resolveFlexGrow()) &&
+              node->resolveFlexGrow() == 0))) {
           // If we don't have any children to flex or we can't flex the node
           // itself, space we've used is all space we need. Root node also
           // should be shrunk to minimum
@@ -2744,13 +2773,13 @@ static void YGNodelayoutImpl(const YGNodeRef node,
 
             if (child->marginLeadingValue(crossAxis).unit == YGUnitAuto &&
                 child->marginTrailingValue(crossAxis).unit == YGUnitAuto) {
-              leadingCrossDim += fmaxf(0.0f, remainingCrossDim / 2);
+              leadingCrossDim += YGFloatMax(0.0f, remainingCrossDim / 2);
             } else if (
                 child->marginTrailingValue(crossAxis).unit == YGUnitAuto) {
               // No-Op
             } else if (
                 child->marginLeadingValue(crossAxis).unit == YGUnitAuto) {
-              leadingCrossDim += fmaxf(0.0f, remainingCrossDim);
+              leadingCrossDim += YGFloatMax(0.0f, remainingCrossDim);
             } else if (alignItem == YGAlignFlexStart) {
               // No-Op
             } else if (alignItem == YGAlignCenter) {
@@ -2769,7 +2798,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
     }
 
     totalLineCrossDim += collectedFlexItemsValues.crossDim;
-    maxLineMainDim = fmaxf(maxLineMainDim, collectedFlexItemsValues.mainDim);
+    maxLineMainDim =
+        YGFloatMax(maxLineMainDim, collectedFlexItemsValues.mainDim);
   }
 
   // STEP 8: MULTI-LINE CONTENT ALIGNMENT
@@ -2832,7 +2862,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
             break;
           }
           if (YGNodeIsLayoutDimDefined(child, crossAxis)) {
-            lineHeight = fmaxf(
+            lineHeight = YGFloatMax(
                 lineHeight,
                 child->getLayout().measuredDimensions[dim[crossAxis]] +
                     child->getMarginForAxis(crossAxis, availableInnerWidth));
@@ -2846,9 +2876,12 @@ static void YGNodelayoutImpl(const YGNodeRef node,
                 child->getMarginForAxis(
                     YGFlexDirectionColumn, availableInnerWidth) -
                 ascent;
-            maxAscentForCurrentLine = fmaxf(maxAscentForCurrentLine, ascent);
-            maxDescentForCurrentLine = fmaxf(maxDescentForCurrentLine, descent);
-            lineHeight = fmaxf(lineHeight, maxAscentForCurrentLine + maxDescentForCurrentLine);
+            maxAscentForCurrentLine =
+                YGFloatMax(maxAscentForCurrentLine, ascent);
+            maxDescentForCurrentLine =
+                YGFloatMax(maxDescentForCurrentLine, descent);
+            lineHeight = YGFloatMax(
+                lineHeight, maxAscentForCurrentLine + maxDescentForCurrentLine);
           }
         }
       }
@@ -2991,8 +3024,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
       measureModeMainDim == YGMeasureModeAtMost &&
       node->getStyle().overflow == YGOverflowScroll) {
     node->setLayoutMeasuredDimension(
-        fmaxf(
-            fminf(
+        YGFloatMax(
+            YGFloatMin(
                 availableInnerMainDim + paddingAndBorderAxisMain,
                 YGNodeBoundAxisWithinMinAndMax(
                     node, mainAxis, maxLineMainDim, mainAxisParentSize)),
@@ -3019,8 +3052,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
       measureModeCrossDim == YGMeasureModeAtMost &&
       node->getStyle().overflow == YGOverflowScroll) {
     node->setLayoutMeasuredDimension(
-        fmaxf(
-            fminf(
+        YGFloatMax(
+            YGFloatMin(
                 availableInnerCrossDim + paddingAndBorderAxisCross,
                 YGNodeBoundAxisWithinMinAndMax(
                     node,
@@ -3135,8 +3168,11 @@ static inline bool YGMeasureModeNewMeasureSizeIsStricterAndStillValid(YGMeasureM
                                                                       YGMeasureMode lastSizeMode,
                                                                       float lastSize,
                                                                       float lastComputedSize) {
-  return lastSizeMode == YGMeasureModeAtMost && sizeMode == YGMeasureModeAtMost &&
-         lastSize > size && (lastComputedSize <= size || YGFloatsEqual(size, lastComputedSize));
+  return lastSizeMode == YGMeasureModeAtMost &&
+      sizeMode == YGMeasureModeAtMost && !YGFloatIsUndefined(lastSize) &&
+      !YGFloatIsUndefined(size) && !YGFloatIsUndefined(lastComputedSize) &&
+      lastSize > size &&
+      (lastComputedSize <= size || YGFloatsEqual(size, lastComputedSize));
 }
 
 float YGRoundValueToPixelGrid(const float value,
@@ -3158,9 +3194,15 @@ float YGRoundValueToPixelGrid(const float value,
   } else {
     // Finally we just round the value
     scaledValue = scaledValue - fractial +
-        (fractial > 0.5f || YGFloatsEqual(fractial, 0.5f) ? 1.0f : 0.0f);
+        (!YGFloatIsUndefined(fractial) &&
+                 (fractial > 0.5f || YGFloatsEqual(fractial, 0.5f))
+             ? 1.0f
+             : 0.0f);
   }
-  return scaledValue / pointScaleFactor;
+  return (YGFloatIsUndefined(scaledValue) ||
+          YGFloatIsUndefined(pointScaleFactor))
+      ? YGUndefined
+      : scaledValue / pointScaleFactor;
 }
 
 bool YGNodeCanUseCachedMeasurement(const YGMeasureMode widthMode,
@@ -3176,7 +3218,8 @@ bool YGNodeCanUseCachedMeasurement(const YGMeasureMode widthMode,
                                    const float marginRow,
                                    const float marginColumn,
                                    const YGConfigRef config) {
-  if (lastComputedHeight < 0 || lastComputedWidth < 0) {
+  if ((!YGFloatIsUndefined(lastComputedHeight) && lastComputedHeight < 0) ||
+      (!YGFloatIsUndefined(lastComputedWidth) && lastComputedWidth < 0)) {
     return false;
   }
   bool useRoundedComparison =
@@ -3534,14 +3577,19 @@ static void YGRoundToPixelGrid(const YGNodeRef node,
 
   const uint32_t childCount = YGNodeGetChildCount(node);
   for (uint32_t i = 0; i < childCount; i++) {
-    YGRoundToPixelGrid(YGNodeGetChild(node, i), pointScaleFactor, absoluteNodeLeft, absoluteNodeTop);
+    YGRoundToPixelGrid(
+        YGNodeGetChild(node, i),
+        pointScaleFactor,
+        absoluteNodeLeft,
+        absoluteNodeTop);
   }
 }
 
-void YGNodeCalculateLayout(const YGNodeRef node,
-                           const float parentWidth,
-                           const float parentHeight,
-                           const YGDirection parentDirection) {
+void YGNodeCalculateLayout(
+    const YGNodeRef node,
+    const float parentWidth,
+    const float parentHeight,
+    const YGDirection parentDirection) {
   // Increment the generation count. This will force the recursive routine to
   // visit
   // all dirty nodes at least once. Subsequent visits will be skipped if the
@@ -3557,16 +3605,16 @@ void YGNodeCalculateLayout(const YGNodeRef node,
             node->getResolvedDimension(dim[YGFlexDirectionRow]), parentWidth) +
         node->getMarginForAxis(YGFlexDirectionRow, parentWidth);
     widthMeasureMode = YGMeasureModeExactly;
-  } else if (
-      YGResolveValue(
-          node->getStyle().maxDimensions[YGDimensionWidth], parentWidth) >=
-      0.0f) {
+  } else if (!YGFloatIsUndefined(YGResolveValue(
+                 node->getStyle().maxDimensions[YGDimensionWidth],
+                 parentWidth))) {
     width = YGResolveValue(
         node->getStyle().maxDimensions[YGDimensionWidth], parentWidth);
     widthMeasureMode = YGMeasureModeAtMost;
   } else {
     width = parentWidth;
-    widthMeasureMode = YGFloatIsUndefined(width) ? YGMeasureModeUndefined : YGMeasureModeExactly;
+    widthMeasureMode = YGFloatIsUndefined(width) ? YGMeasureModeUndefined
+                                                 : YGMeasureModeExactly;
   }
 
   float height = YGUndefined;
@@ -3577,18 +3625,17 @@ void YGNodeCalculateLayout(const YGNodeRef node,
                  parentHeight) +
         node->getMarginForAxis(YGFlexDirectionColumn, parentWidth);
     heightMeasureMode = YGMeasureModeExactly;
-  } else if (
-      YGResolveValue(
-          node->getStyle().maxDimensions[YGDimensionHeight], parentHeight) >=
-      0.0f) {
+  } else if (!YGFloatIsUndefined(YGResolveValue(
+                 node->getStyle().maxDimensions[YGDimensionHeight],
+                 parentHeight))) {
     height = YGResolveValue(
         node->getStyle().maxDimensions[YGDimensionHeight], parentHeight);
     heightMeasureMode = YGMeasureModeAtMost;
   } else {
     height = parentHeight;
-    heightMeasureMode = YGFloatIsUndefined(height) ? YGMeasureModeUndefined : YGMeasureModeExactly;
+    heightMeasureMode = YGFloatIsUndefined(height) ? YGMeasureModeUndefined
+                                                   : YGMeasureModeExactly;
   }
-
   if (YGLayoutNodeInternal(
           node,
           width,
diff --git a/ReactCommon/yoga/yoga/Yoga.h b/ReactCommon/yoga/yoga/Yoga.h
index bca51da28d373a..a632917af859b7 100644
--- a/ReactCommon/yoga/yoga/Yoga.h
+++ b/ReactCommon/yoga/yoga/Yoga.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
@@ -20,13 +18,14 @@
 #include <stdbool.h>
 #endif
 
-// Not defined in MSVC++
-#ifndef NAN
-static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
-#define NAN (*(const float *) __nan)
-#endif
-
-#define YGUndefined NAN
+/** Large positive number signifies that the property(float) is undefined.
+ *Earlier we used to have YGundefined as NAN, but the downside of this is that
+ *we can't use -ffast-math compiler flag as it assumes all floating-point
+ *calculation involve and result into finite numbers. For more information
+ *regarding -ffast-math compiler flag in clang, have a look at
+ *https://clang.llvm.org/docs/UsersManual.html#cmdoption-ffast-math
+ **/
+#define YGUndefined 10E20F
 
 #include "YGEnums.h"
 #include "YGMacros.h"
diff --git a/ReactNative/DEFS.bzl b/ReactNative/DEFS.bzl
index a9f5b39813a2be..8842ed74f8cd23 100644
--- a/ReactNative/DEFS.bzl
+++ b/ReactNative/DEFS.bzl
@@ -21,6 +21,7 @@ ANDROID_JSC_INTERNAL_DEPS = [
     '//native/third-party/jsc:jsc_legacy_profiler',
 ]
 ANDROID_JSC_DEPS = ANDROID_JSC_INTERNAL_DEPS
+ANDROID = "Android"
 
 YOGA_TARGET = '//ReactAndroid/src/main/java/com/facebook:yoga'
 FBGLOGINIT_TARGET = '//ReactAndroid/src/main/jni/first-party/fbgloginit:fbgloginit'
@@ -33,7 +34,7 @@ with allow_unsafe_import():
 
 
 # Building is not supported in OSS right now
-def rn_xplat_cxx_library(name, **kwargs):
+def rn_xplat_cxx_library(name, platforms = None, **kwargs):
     cxx_library(name=name, **kwargs)
 
 
@@ -150,7 +151,7 @@ def rn_robolectric_test(name, srcs, vm_args=None, *args, **kwargs):
     # RN tests use  Powermock, which means they get their own ClassLoaders.
     # Because the yoga native library (or any native library) can only be loaded into one
     # ClassLoader at a time, we need to run each in its own process, hence fork_mode = 'per_test'.
-    robolectric_test(
+    native.robolectric_test(
         name=name,
         use_cxx_libraries=True,
         cxx_library_whitelist=[
diff --git a/babel-preset/configs/hmr.js b/babel-preset/configs/hmr.js
index 0fff0fc9a68fd4..91cb9a356c654b 100644
--- a/babel-preset/configs/hmr.js
+++ b/babel-preset/configs/hmr.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/babel-preset/configs/main.js b/babel-preset/configs/main.js
index 89ebef095b0f21..dca6ddebd8e216 100644
--- a/babel-preset/configs/main.js
+++ b/babel-preset/configs/main.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/babel-preset/index.js b/babel-preset/index.js
index a1e2956ed5631d..aaff5ba9f15c05 100644
--- a/babel-preset/index.js
+++ b/babel-preset/index.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/babel-preset/lib/resolvePlugins.js b/babel-preset/lib/resolvePlugins.js
index 438e5c74d4728f..ebbe5ddacfc559 100644
--- a/babel-preset/lib/resolvePlugins.js
+++ b/babel-preset/lib/resolvePlugins.js
@@ -1,10 +1,10 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
  */
 'use strict';
 
@@ -14,21 +14,21 @@
  * the file it's compiling. This makes sure that we're using the plugins
  * installed in the react-native package.
  */
-function resolvePlugins(plugins) {
-  return plugins.map(resolvePlugin);
+function resolvePlugins(plugins, prefix) {
+  return plugins.map(plugin => resolvePlugin(plugin, prefix));
 }
 
 /**
  * Manually resolve a single Babel plugin.
  */
-function resolvePlugin(plugin) {
+function resolvePlugin(plugin, prefix = 'babel-plugin-') {
   // Normalise plugin to an array.
   if (!Array.isArray(plugin)) {
     plugin = [plugin];
   }
   // Only resolve the plugin if it's a string reference.
   if (typeof plugin[0] === 'string') {
-    plugin[0] = require('babel-plugin-' + plugin[0]);
+    plugin[0] = require(prefix + plugin[0]);
     plugin[0] = plugin[0].__esModule ? plugin[0].default : plugin[0];
   }
   return plugin;
@@ -36,3 +36,7 @@ function resolvePlugin(plugin) {
 
 module.exports = resolvePlugins;
 module.exports.resolvePlugin = resolvePlugin;
+module.exports.resolvePluginAs = (prefix, plugin) =>
+  resolvePlugin(plugin, prefix);
+module.exports.resolvePluginsAs = (prefix, plugins) =>
+  resolvePlugins(plugins, prefix);
diff --git a/babel-preset/package.json b/babel-preset/package.json
index 77e1090ed1754a..3181ee146f24a4 100644
--- a/babel-preset/package.json
+++ b/babel-preset/package.json
@@ -9,7 +9,7 @@
     "preset",
     "react-native"
   ],
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/facebook/react-native/issues"
   },
diff --git a/babel-preset/plugins.js b/babel-preset/plugins.js
index d629bd92cbbb1a..d572a11b042e54 100644
--- a/babel-preset/plugins.js
+++ b/babel-preset/plugins.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/babel-preset/transforms/transform-symbol-member.js b/babel-preset/transforms/transform-symbol-member.js
index 5962918dc67230..fd5333d1fe5445 100644
--- a/babel-preset/transforms/transform-symbol-member.js
+++ b/babel-preset/transforms/transform-symbol-member.js
@@ -1,5 +1,8 @@
 /**
- * Copyright 2004-present Facebook. All Rights Reserved.
+ * Copyright (c) 2004-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/bots/README.md b/bots/README.md
index 58cf901f82062c..985687f387b207 100644
--- a/bots/README.md
+++ b/bots/README.md
@@ -9,10 +9,10 @@ If you'd like to make changes to the Dangerfile, find an existing PR on the Reac
 Then, run from the React Native root directory:
 
 ```
-cd .circleci
+cd bots
 npm install
 ..
-node .circleci/node_modules/.bin/danger pr https://github.com/facebook/react-native/pull/1		
+node bots/node_modules/.bin/danger pr https://github.com/facebook/react-native/pull/1		
 ```
 
 And you will get the responses from parsing the Dangerfile.
diff --git a/bots/code-analysis-bot.js b/bots/code-analysis-bot.js
index 0c3a8bdda21585..4ab9af0779618d 100644
--- a/bots/code-analysis-bot.js
+++ b/bots/code-analysis-bot.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/bots/dangerfile.js b/bots/dangerfile.js
index 327e75ce54baca..9c9218b34d36b6 100644
--- a/bots/dangerfile.js
+++ b/bots/dangerfile.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
@@ -47,7 +45,7 @@ if (!includesTestPlan) {
 
 // Regex looks for given categories, types, a file/framework/component, and a message - broken into 4 capture groups
 const releaseNotesRegex = /\[(ANDROID|CLI|DOCS|GENERAL|INTERNAL|IOS|TVOS|WINDOWS)\]\s*?\[(BREAKING|BUGFIX|ENHANCEMENT|FEATURE|MINOR)\]\s*?\[(.*)\]\s*?\-\s*?(.*)/ig;
-const includesReleaseNotes = danger.github.pr.body.toLowerCase().includes('release notes');
+const includesReleaseNotes = danger.github.pr.body && danger.github.pr.body.toLowerCase().includes('release notes');
 const correctlyFormattedReleaseNotes = releaseNotesRegex.test(danger.github.pr.body);
 const releaseNotesCaptureGroups = releaseNotesRegex.exec(danger.github.pr.body);
 
@@ -63,22 +61,18 @@ if (!includesReleaseNotes) {
   const category = releaseNotesCaptureGroups[1].toLowerCase();
 
   // Use Release Notes to Tag PRs appropriately
-  // if (category === 'ios' ){
-  //   markdown('@facebook-github-bot label iOS');
-  // }
+  if (category === 'ios' || category === 'tvos') {
+    message('Suggested label: iOS');
+  }
 
-  // if (category === 'android' ){
-  //   markdown('@facebook-github-bot label Android');
-  // }
-}
+  if (category === 'android') {
+    message('Suggested label: Android');
+  }
 
-// Tags PRs that have been submitted by a core contributor.
-// TODO: Switch to using an actual MAINTAINERS file.
-const taskforce = fs.readFileSync('./IssueCommands.txt', 'utf8').split('\n')[0].split(':')[1];
-const isSubmittedByTaskforce = includes(taskforce, danger.github.pr.user.login);
-// if (isSubmittedByTaskforce) {
-//   markdown('@facebook-github-bot label Core Team');
-// }
+  if (category === 'cli') {
+    message('Suggested label: Tooling');
+  }
+}
 
 // Tags big PRs
 var bigPRThreshold = 600;
@@ -86,30 +80,16 @@ if (danger.github.pr.additions + danger.github.pr.deletions > bigPRThreshold) {
   const title = ':exclamation: Big PR';
   const idea = `This PR is extremely unlikely to get reviewed because it touches ${danger.github.pr.additions + danger.github.pr.deletions} lines.`;
   warn(`${title} - <i>${idea}</i>`);
-
-  // markdown('@facebook-github-bot large-pr');
-}
-if (danger.git.modified_files + danger.git.added_files + danger.git.deleted_files > bigPRThreshold) {
+} else if (danger.git.modified_files + danger.git.added_files + danger.git.deleted_files > bigPRThreshold) {
   const title = ':exclamation: Big PR';
   const idea = `This PR is extremely unlikely to get reviewed because it touches ${danger.git.modified_files + danger.git.added_files + danger.git.deleted_files} files.`;
   warn(`${title} - <i>${idea}</i>`);
-
-  // markdown('@facebook-github-bot large-pr');
-}
-
-// Warns if the bots whitelist file is updated.
-const issueCommandsFileModified = includes(danger.git.modified_files, 'bots/IssueCommands.txt');
-if (issueCommandsFileModified) {
-  const title = ':exclamation: Bots';
-  const idea = 'This PR appears to modify the list of people that may issue ' + 
-  'commands to the GitHub bot.';
-  warn(`${title} - <i>${idea}</i>`);
 }
 
 // Warns if the PR is opened against stable, as commits need to be cherry picked and tagged by a release maintainer.
 // Fails if the PR is opened against anything other than `master` or `-stable`.
 const isMergeRefMaster = danger.github.pr.base.ref === 'master';
-const isMergeRefStable = danger.github.pr.base.ref.indexOf(`-stable`) !== -1;
+const isMergeRefStable = danger.github.pr.base.ref.indexOf('-stable') !== -1;
 if (!isMergeRefMaster && isMergeRefStable) {
   const title = ':grey_question: Base Branch';
   const idea = 'The base branch for this PR is something other than `master`. Are you sure you want to merge these changes into a stable release? If you are interested in backporting updates to an older release, the suggested approach is to land those changes on `master` first and then cherry-pick the commits into the branch for that release. The [Releases Guide](https://github.com/facebook/react-native/blob/master/Releases.md) has more information.';
@@ -119,23 +99,3 @@ if (!isMergeRefMaster && isMergeRefStable) {
   const idea = 'The base branch for this PR is something other than `master`. [Are you sure you want to target something other than the `master` branch?](http://facebook.github.io/react-native/docs/contributing.html#pull-requests)';
   fail(`${title} - <i>${idea}</i>`);
 }
-
-// People can add themselves to CODEOWNERS in order to be automatically added as reviewers when a file matching a glob pattern is modified. The following will have the bot add a mention in that case.
-const codeowners = fs.readFileSync('../.github/CODEOWNERS', 'utf8').split('\n');
-let mentions = [];
-codeowners.forEach((codeowner) => {
-  const pattern = codeowner.split(' ')[0];
-  const owners = codeowner.substring(pattern.length).trim().split(' ');
-
-  const modifiedFileHasOwner = path => minimatch(path, pattern);
-  const modifiesOwnedCode = danger.git.modified_files.filter(modifiedFileHasOwner).length > 0;
-
-  if (modifiesOwnedCode) {
-    mentions = mentions.concat(owners);
-  }
-});
-const isOwnedCodeModified = mentions.length > 0;
-if (isOwnedCodeModified) {
-  const uniqueMentions = new Set(mentions);
-  markdown('Attention: ' + [...uniqueMentions].join(', '));
-}
diff --git a/cli.js b/cli.js
index 88837275f14e00..272a78dfcdcf25 100644
--- a/cli.js
+++ b/cli.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/flow-github/metro.js b/flow-github/metro.js
index 12f50d287f61ef..ff06b427774628 100644
--- a/flow-github/metro.js
+++ b/flow-github/metro.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
@@ -23,4 +21,4 @@ declare module 'metro/src/HmrServer' {
 
 declare module 'metro/src/lib/bundle-modules/HMRClient' {
   declare module.exports: any;
-}
\ No newline at end of file
+}
diff --git a/flow/Map.js b/flow/Map.js
index da397dfd2dda35..f2021affd67a63 100644
--- a/flow/Map.js
+++ b/flow/Map.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/flow/Position.js b/flow/Position.js
index d72ff6aa02fca3..58e3330b0b926a 100644
--- a/flow/Position.js
+++ b/flow/Position.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @nolint
diff --git a/flow/Promise.js b/flow/Promise.js
index 4f6fb3971eebcb..d69944eb4b47e2 100644
--- a/flow/Promise.js
+++ b/flow/Promise.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/flow/Set.js b/flow/Set.js
index 6239a530439c86..54b997a68a6f44 100644
--- a/flow/Set.js
+++ b/flow/Set.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @nolint
diff --git a/flow/console.js b/flow/console.js
index bef6d036b20e4e..4e57ba953715c3 100644
--- a/flow/console.js
+++ b/flow/console.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/flow/create-react-class.js b/flow/create-react-class.js
index 238ff44cf01df7..571653b18de83b 100644
--- a/flow/create-react-class.js
+++ b/flow/create-react-class.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @nolint
diff --git a/flow/fbjs.js b/flow/fbjs.js
index 5698508cc82460..f7b41b5a6a3ad8 100644
--- a/flow/fbjs.js
+++ b/flow/fbjs.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 declare module 'fbjs/lib/invariant' {
diff --git a/flow/prop-types.js b/flow/prop-types.js
index 13f7a65d53df77..c79dab62ba9345 100644
--- a/flow/prop-types.js
+++ b/flow/prop-types.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @nolint
diff --git a/jest/.eslintrc b/jest/.eslintrc
deleted file mode 100644
index ddcf4e27251d8f..00000000000000
--- a/jest/.eslintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "rules": {
-    // This folder currently runs through babel and doesn't need to be
-    // compatible with node 4
-    "comma-dangle": 0
-  }
-}
diff --git a/jest/assetFileTransformer.js b/jest/assetFileTransformer.js
index 81bdee21e83a8c..e3a318aed3c187 100644
--- a/jest/assetFileTransformer.js
+++ b/jest/assetFileTransformer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/jest/mockComponent.js b/jest/mockComponent.js
index bb63a3e3ea635b..84c162d867f4f4 100644
--- a/jest/mockComponent.js
+++ b/jest/mockComponent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/jest/preprocessor.js b/jest/preprocessor.js
index a5b96062e0eedc..e6a897f8e02abc 100644
--- a/jest/preprocessor.js
+++ b/jest/preprocessor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
@@ -13,9 +11,6 @@
 
 'use strict';
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const babel = require('babel-core');
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
  * found when Flow v0.54 was deployed. To see the error delete this comment and
@@ -35,9 +30,7 @@ const nodeOptions = babelRegisterOnly.config([nodeFiles]);
 
 babelRegisterOnly([]);
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
+/* $FlowFixMe(site=react_native_oss) */
 const transformer = require('metro/src/transformer.js');
 module.exports = {
   process(src/*: string*/, file/*: string*/) {
diff --git a/jest/setup.js b/jest/setup.js
index 2fa1075b6451df..0d4553b3f756f8 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
@@ -82,16 +80,10 @@ jest
     const ReactNative = require.requireActual('ReactNative');
     const NativeMethodsMixin =
       ReactNative.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.NativeMethodsMixin;
-    [
-      'measure',
-      'measureInWindow',
-      'measureLayout',
-      'setNativeProps',
-      'focus',
-      'blur',
-    ].forEach((key) => {
+
+    const mockFunction = (key) => {
       let warned = false;
-      NativeMethodsMixin[key] = function() {
+      return function() {
         if (warned) {
           return;
         }
@@ -103,6 +95,18 @@ jest
             'native environment.',
         );
       };
+    };
+
+    [
+      'measure',
+      'measureInWindow',
+      'measureLayout',
+      'setNativeProps',
+      'focus',
+      'blur',
+    ].forEach((key) => {
+      NativeMethodsMixin[key] = mockFunction(key);
+      ReactNative.NativeComponent.prototype[key] = mockFunction(key);
     });
     return ReactNative;
   })
@@ -115,6 +119,7 @@ const mockNativeModules = {
   },
   AppState: {
     addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
   },
   AsyncLocalStorage: {
     multiGet: jest.fn((keys, callback) => process.nextTick(() => callback(null, []))),
diff --git a/lib/InitializeJavaScriptAppEngine.js b/lib/InitializeJavaScriptAppEngine.js
index c560dccac1b5cf..6709e0a27109d5 100644
--- a/lib/InitializeJavaScriptAppEngine.js
+++ b/lib/InitializeJavaScriptAppEngine.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/RCTEventEmitter.js b/lib/RCTEventEmitter.js
index b48677174a868c..8968fb8641df78 100644
--- a/lib/RCTEventEmitter.js
+++ b/lib/RCTEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/TextInputState.js b/lib/TextInputState.js
index 74f58bb27e36d3..37738ceb670a91 100644
--- a/lib/TextInputState.js
+++ b/lib/TextInputState.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/UIManager.js b/lib/UIManager.js
index bf87c346ca8ac0..6bd741903fb3c9 100644
--- a/lib/UIManager.js
+++ b/lib/UIManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/UIManagerStatTracker.js b/lib/UIManagerStatTracker.js
index 6c66a042033b10..9300a7c6f7eaa9 100644
--- a/lib/UIManagerStatTracker.js
+++ b/lib/UIManagerStatTracker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/View.js b/lib/View.js
index 5174bdea4fe9c5..6e3f20a858556c 100644
--- a/lib/View.js
+++ b/lib/View.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/deepDiffer.js b/lib/deepDiffer.js
index e7584bc64cb850..ad3d3cb05329ba 100644
--- a/lib/deepDiffer.js
+++ b/lib/deepDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/deepFreezeAndThrowOnMutationInDev.js b/lib/deepFreezeAndThrowOnMutationInDev.js
index acee5bff5b7e5b..92d9f8f40e0b47 100644
--- a/lib/deepFreezeAndThrowOnMutationInDev.js
+++ b/lib/deepFreezeAndThrowOnMutationInDev.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/flattenStyle.js b/lib/flattenStyle.js
index e4dfd467007bdc..3c5651fdc60250 100644
--- a/lib/flattenStyle.js
+++ b/lib/flattenStyle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/.eslintrc b/local-cli/.eslintrc
deleted file mode 100644
index cb6a62b52255e1..00000000000000
--- a/local-cli/.eslintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "rules": {
-    // This folder currently runs through babel and doesn't need to be
-    // compatible with node 4
-    "comma-dangle": 0,
-
-    "lint/extra-arrow-initializer": 0,
-    "no-alert": 0,
-    "no-console-disallow": 0
-  },
-  "env": {
-    "node": true
-  }
-}
diff --git a/local-cli/.npmignore b/local-cli/.npmignore
new file mode 100644
index 00000000000000..e40506d719b298
--- /dev/null
+++ b/local-cli/.npmignore
@@ -0,0 +1,2 @@
+__fixtures__
+__tests__
diff --git a/local-cli/__mocks__/beeper.js b/local-cli/__mocks__/beeper.js
index 79410a08cbd449..2bbac3717fbcad 100644
--- a/local-cli/__mocks__/beeper.js
+++ b/local-cli/__mocks__/beeper.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
  'use strict';
 
diff --git a/local-cli/__mocks__/fs.js b/local-cli/__mocks__/fs.js
index a9bd37c8df557b..bd4d5c10001c8e 100644
--- a/local-cli/__mocks__/fs.js
+++ b/local-cli/__mocks__/fs.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  */
diff --git a/local-cli/__tests__/fs-mock-test.js b/local-cli/__tests__/fs-mock-test.js
index 39f6e9e1248f49..4928f3bd9ecf23 100644
--- a/local-cli/__tests__/fs-mock-test.js
+++ b/local-cli/__tests__/fs-mock-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  * @flow
@@ -32,16 +30,10 @@ describe('fs mock', () => {
     it('stores content correctly', () => {
       fs.writeFileSync('/test', 'foobar', 'utf8');
       const content = fs.readFileSync('/test', 'utf8');
-      /* $FlowFixMe(>=0.56.0 site=react_native_oss) This comment suppresses an
-       * error found when Flow v0.56 was deployed. To see the error delete this
-       * comment and run Flow. */
       expect(content).toEqual('foobar');
     });
 
     it('fails on missing path', () => {
-      /* $FlowFixMe(>=0.56.0 site=react_native_oss) This comment suppresses an
-       * error found when Flow v0.56 was deployed. To see the error delete this
-       * comment and run Flow. */
       expect(() =>
         fs.writeFileSync('/dir/test', 'foobar', 'utf8'),
       ).toThrowError('ENOENT: no such file or directory');
@@ -59,9 +51,6 @@ describe('fs mock', () => {
       fs.mkdirSync('/dir', 0o777);
       fs.writeFileSync('/dir/test', 'foobar', 'utf8');
       const content = fs.readFileSync('/dir/test', 'utf8');
-      /* $FlowFixMe(>=0.56.0 site=react_native_oss) This comment suppresses an
-       * error found when Flow v0.56 was deployed. To see the error delete this
-       * comment and run Flow. */
       expect(content).toEqual('foobar');
     });
 
@@ -70,9 +59,6 @@ describe('fs mock', () => {
       fs.writeFileSync('/dir/test', 'foobar', 'utf8');
       fs.mkdirSync('/dir', 0o777);
       const content = fs.readFileSync('/dir/test', 'utf8');
-      /* $FlowFixMe(>=0.56.0 site=react_native_oss) This comment suppresses an
-       * error found when Flow v0.56 was deployed. To see the error delete this
-       * comment and run Flow. */
       expect(content).toEqual('foobar');
     });
   });
diff --git a/local-cli/bundle/__mocks__/sign.js b/local-cli/bundle/__mocks__/sign.js
index 80ff1860e3f736..a7f2bdb6fc8aad 100644
--- a/local-cli/bundle/__mocks__/sign.js
+++ b/local-cli/bundle/__mocks__/sign.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js b/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js
index f9e3091ac3239c..d39058dc6ba073 100644
--- a/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js
+++ b/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js b/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js
index 35ce285e3328d4..bd8e78d18d0645 100644
--- a/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js
+++ b/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js b/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js
index 4de3b3051b5830..52e54530ba7fc8 100644
--- a/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js
+++ b/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/bundle/assetPathUtils.js b/local-cli/bundle/assetPathUtils.js
index cc67d949ca69ce..891908eb480f31 100644
--- a/local-cli/bundle/assetPathUtils.js
+++ b/local-cli/bundle/assetPathUtils.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index afbab9ec8a3ede..10d1ecc6b78ba3 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
@@ -12,24 +10,16 @@
 'use strict';
 
 const log = require('../util/log').out('bundle');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
+/* $FlowFixMe(site=react_native_oss) */
 const Server = require('metro/src/Server');
 const {Terminal} = require('metro-core');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
+/* $FlowFixMe(site=react_native_oss) */
 const TerminalReporter = require('metro/src/lib/TerminalReporter');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
+/* $FlowFixMe(site=react_native_oss) */
 const TransformCaching = require('metro/src/lib/TransformCaching');
 
 const {defaults} = require('metro');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
+/* $FlowFixMe(site=react_native_oss) */
 const outputBundle = require('metro/src/shared/output/bundle');
 const path = require('path');
 const saveAssets = require('./saveAssets');
@@ -42,9 +32,6 @@ import type {ConfigT} from 'metro';
 const defaultAssetExts = defaults.assetExts;
 const defaultSourceExts = defaults.sourceExts;
 const defaultPlatforms = defaults.platforms;
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const defaultProvidesModuleNodeModules = defaults.providesModuleNodeModules;
 
 async function buildBundle(
@@ -95,7 +82,10 @@ async function buildBundle(
     assetExts: defaultAssetExts.concat(assetExts),
     assetRegistryPath: ASSET_REGISTRY_PATH,
     blacklistRE: config.getBlacklistRE(),
+    cacheStores: config.cacheStores,
+    cacheVersion: config.cacheVersion,
     dynamicDepsInPackages: config.dynamicDepsInPackages,
+    enableBabelRCLookup: config.getEnableBabelRCLookup(),
     extraNodeModules: config.extraNodeModules,
     getModulesRunBeforeMainModule: config.getModulesRunBeforeMainModule,
     getPolyfills: config.getPolyfills,
@@ -111,7 +101,7 @@ async function buildBundle(
     providesModuleNodeModules: providesModuleNodeModules,
     resetCache: args.resetCache,
     reporter: new TerminalReporter(terminal),
-    sourceExts: defaultSourceExts.concat(sourceExts),
+    sourceExts: sourceExts.concat(defaultSourceExts),
     transformCache: TransformCaching.useTempDir(),
     transformModulePath: transformModulePath,
     watch: false,
diff --git a/local-cli/bundle/bundle.js b/local-cli/bundle/bundle.js
index 3a177bd960de18..7bc7099b58fbb2 100644
--- a/local-cli/bundle/bundle.js
+++ b/local-cli/bundle/bundle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/bundle/bundleCommandLineArgs.js b/local-cli/bundle/bundleCommandLineArgs.js
index 8fbd2775af7277..cc63e32505a25d 100644
--- a/local-cli/bundle/bundleCommandLineArgs.js
+++ b/local-cli/bundle/bundleCommandLineArgs.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/bundle/filterPlatformAssetScales.js b/local-cli/bundle/filterPlatformAssetScales.js
index d9e8daa2e02ed8..0843b75dce6b76 100644
--- a/local-cli/bundle/filterPlatformAssetScales.js
+++ b/local-cli/bundle/filterPlatformAssetScales.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/local-cli/bundle/getAssetDestPathAndroid.js b/local-cli/bundle/getAssetDestPathAndroid.js
index c267aed8ba446b..bdd3c49e32e415 100644
--- a/local-cli/bundle/getAssetDestPathAndroid.js
+++ b/local-cli/bundle/getAssetDestPathAndroid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/bundle/getAssetDestPathIOS.js b/local-cli/bundle/getAssetDestPathIOS.js
index 4e6290748b2a61..61b935a1703aee 100644
--- a/local-cli/bundle/getAssetDestPathIOS.js
+++ b/local-cli/bundle/getAssetDestPathIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/bundle/saveAssets.js b/local-cli/bundle/saveAssets.js
index 32b18c5de9e30b..94fe559a2b49e2 100644
--- a/local-cli/bundle/saveAssets.js
+++ b/local-cli/bundle/saveAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/bundle/types.flow.js b/local-cli/bundle/types.flow.js
index ef6f5671236bab..ecf86af407ee6b 100644
--- a/local-cli/bundle/types.flow.js
+++ b/local-cli/bundle/types.flow.js
@@ -1,16 +1,12 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
 'use strict';
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
+/* $FlowFixMe(site=react_native_oss) */
 export type {OutputOptions, RequestOptions} from 'metro/src/shared/types.flow';
diff --git a/local-cli/bundle/unbundle.js b/local-cli/bundle/unbundle.js
index 1081edc29ff293..bc7785fd0ee80b 100644
--- a/local-cli/bundle/unbundle.js
+++ b/local-cli/bundle/unbundle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/cli.js b/local-cli/cli.js
index 14cf1a8d8d6bb0..3f31cbad4770be 100644
--- a/local-cli/cli.js
+++ b/local-cli/cli.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/cliEntry.js b/local-cli/cliEntry.js
index 3062394a866f1b..018dd8459a5f19 100644
--- a/local-cli/cliEntry.js
+++ b/local-cli/cliEntry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/commands.js b/local-cli/commands.js
index 9f27908e9d6dcf..1e1a2054738429 100644
--- a/local-cli/commands.js
+++ b/local-cli/commands.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/core/Constants.js b/local-cli/core/Constants.js
index 66d59f8e9d8937..73fddbbb1035aa 100644
--- a/local-cli/core/Constants.js
+++ b/local-cli/core/Constants.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js b/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
index ea87ca03e4fbf9..dcbb8002d3c4c9 100644
--- a/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
+++ b/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/android/findManifest.spec.js b/local-cli/core/__tests__/android/findManifest.spec.js
index 8aaeab85b53cdf..73834b61da6780 100644
--- a/local-cli/core/__tests__/android/findManifest.spec.js
+++ b/local-cli/core/__tests__/android/findManifest.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/android/findPackageClassName.spec.js b/local-cli/core/__tests__/android/findPackageClassName.spec.js
index e441b3afbdb83d..36da8b4df31dad 100644
--- a/local-cli/core/__tests__/android/findPackageClassName.spec.js
+++ b/local-cli/core/__tests__/android/findPackageClassName.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/android/getDependencyConfig.spec.js b/local-cli/core/__tests__/android/getDependencyConfig.spec.js
index 3ed4efe976391e..31ae35ad4f49ba 100644
--- a/local-cli/core/__tests__/android/getDependencyConfig.spec.js
+++ b/local-cli/core/__tests__/android/getDependencyConfig.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/android/getProjectConfig.spec.js b/local-cli/core/__tests__/android/getProjectConfig.spec.js
index c680f52d3849ab..02ee04512a4245 100644
--- a/local-cli/core/__tests__/android/getProjectConfig.spec.js
+++ b/local-cli/core/__tests__/android/getProjectConfig.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/android/readManifest.spec.js b/local-cli/core/__tests__/android/readManifest.spec.js
index 05aefb8b480cb1..8a1dead25f15d7 100644
--- a/local-cli/core/__tests__/android/readManifest.spec.js
+++ b/local-cli/core/__tests__/android/readManifest.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/findAssets.spec.js b/local-cli/core/__tests__/findAssets.spec.js
index 3cf93eca45f239..768be38029409f 100644
--- a/local-cli/core/__tests__/findAssets.spec.js
+++ b/local-cli/core/__tests__/findAssets.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/findPlugins.spec.js b/local-cli/core/__tests__/findPlugins.spec.js
index 3cc7488a30eade..aba8e95d5da142 100644
--- a/local-cli/core/__tests__/findPlugins.spec.js
+++ b/local-cli/core/__tests__/findPlugins.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/ios/findPodfilePath.spec.js b/local-cli/core/__tests__/ios/findPodfilePath.spec.js
index 4f4b8edd2367ff..a5e97030574eef 100644
--- a/local-cli/core/__tests__/ios/findPodfilePath.spec.js
+++ b/local-cli/core/__tests__/ios/findPodfilePath.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/core/__tests__/ios/findPodspecName.spec.js b/local-cli/core/__tests__/ios/findPodspecName.spec.js
index 2f28fb228622b4..91873779022ad1 100644
--- a/local-cli/core/__tests__/ios/findPodspecName.spec.js
+++ b/local-cli/core/__tests__/ios/findPodspecName.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/core/__tests__/ios/findProject.spec.js b/local-cli/core/__tests__/ios/findProject.spec.js
index 33cc75ce89649e..78b4be1e3a0147 100644
--- a/local-cli/core/__tests__/ios/findProject.spec.js
+++ b/local-cli/core/__tests__/ios/findProject.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/ios/getProjectConfig.spec.js b/local-cli/core/__tests__/ios/getProjectConfig.spec.js
index 108a13e1eb7ca3..5d3c72caeef692 100644
--- a/local-cli/core/__tests__/ios/getProjectConfig.spec.js
+++ b/local-cli/core/__tests__/ios/getProjectConfig.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/makeCommand.spec.js b/local-cli/core/__tests__/makeCommand.spec.js
index f269572a9b59cb..95110375cef10b 100644
--- a/local-cli/core/__tests__/makeCommand.spec.js
+++ b/local-cli/core/__tests__/makeCommand.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/android/findAndroidAppFolder.js b/local-cli/core/android/findAndroidAppFolder.js
index 3a76f4d189b123..6eac1dea16c227 100644
--- a/local-cli/core/android/findAndroidAppFolder.js
+++ b/local-cli/core/android/findAndroidAppFolder.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/android/findManifest.js b/local-cli/core/android/findManifest.js
index bbe71696d02303..481a8a4745259a 100644
--- a/local-cli/core/android/findManifest.js
+++ b/local-cli/core/android/findManifest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/android/findPackageClassName.js b/local-cli/core/android/findPackageClassName.js
index 8d59aba2689c03..45e2706a4d2959 100644
--- a/local-cli/core/android/findPackageClassName.js
+++ b/local-cli/core/android/findPackageClassName.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/android/index.js b/local-cli/core/android/index.js
index cc229d298f4fd9..c21ca60d8f7e14 100644
--- a/local-cli/core/android/index.js
+++ b/local-cli/core/android/index.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
@@ -126,3 +124,5 @@ exports.dependencyConfig = function dependencyConfigAndroid(folder, userConfig)
 
   return { sourceDir, folder, manifest, packageImportPath, packageInstance };
 };
+
+exports.linkConfig = require('../../link/android');
diff --git a/local-cli/core/android/readManifest.js b/local-cli/core/android/readManifest.js
index 8a39c7d27a0459..7215c67b18e57b 100644
--- a/local-cli/core/android/readManifest.js
+++ b/local-cli/core/android/readManifest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/findAssets.js b/local-cli/core/findAssets.js
index ddfa9beea388c9..1240f25e7ebc0f 100644
--- a/local-cli/core/findAssets.js
+++ b/local-cli/core/findAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/findPlugins.js b/local-cli/core/findPlugins.js
index 8a3c30a4253418..fbf3f064f703bf 100644
--- a/local-cli/core/findPlugins.js
+++ b/local-cli/core/findPlugins.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/index.js b/local-cli/core/index.js
index 0d43e87c24122f..e5f2ba33af6b37 100644
--- a/local-cli/core/index.js
+++ b/local-cli/core/index.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/core/ios/findProject.js b/local-cli/core/ios/findProject.js
index 71170337e50082..05b9e20b9b7ac1 100644
--- a/local-cli/core/ios/findProject.js
+++ b/local-cli/core/ios/findProject.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/ios/index.js b/local-cli/core/ios/index.js
index 6bca5946352085..bb306f47846bbc 100644
--- a/local-cli/core/ios/index.js
+++ b/local-cli/core/ios/index.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
@@ -57,3 +55,5 @@ exports.projectConfig = function projectConfigIOS(folder, userConfig) {
 };
 
 exports.dependencyConfig = exports.projectConfig;
+
+exports.linkConfig = require('../../link/ios');
diff --git a/local-cli/core/makeCommand.js b/local-cli/core/makeCommand.js
index 2eab6caf13922f..a386a0fba376ab 100644
--- a/local-cli/core/makeCommand.js
+++ b/local-cli/core/makeCommand.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/wrapCommands.js b/local-cli/core/wrapCommands.js
index c7a7fe1e51067d..f47cec265406b2 100644
--- a/local-cli/core/wrapCommands.js
+++ b/local-cli/core/wrapCommands.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/dependencies/dependencies.js b/local-cli/dependencies/dependencies.js
index 3558f576cffb4b..b80f68249de630 100644
--- a/local-cli/dependencies/dependencies.js
+++ b/local-cli/dependencies/dependencies.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
@@ -27,8 +25,10 @@ function dependencies(argv, config, args, packagerInstance) {
       typeof config.getTransformModulePath === 'function' ? config.getTransformModulePath() :
       undefined;
 
+
   const packageOpts = {
     assetRegistryPath: ASSET_REGISTRY_PATH,
+    cacheStores: [],
     projectRoots: config.getProjectRoots(),
     blacklistRE: config.getBlacklistRE(),
     dynamicDepsInPackages: config.dynamicDepsInPackages,
@@ -88,6 +88,7 @@ function dependencies(argv, config, args, packagerInstance) {
 
 module.exports = {
   name: 'dependencies',
+  description: 'lists dependencies',
   func: dependencies,
   options: [
     {
diff --git a/local-cli/eject/eject.js b/local-cli/eject/eject.js
index e49b5a5ecd4caa..569299018d3a32 100644
--- a/local-cli/eject/eject.js
+++ b/local-cli/eject/eject.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/generator/copyProjectTemplateAndReplace.js b/local-cli/generator/copyProjectTemplateAndReplace.js
index 91a392ee49904b..5840e587e7ef16 100644
--- a/local-cli/generator/copyProjectTemplateAndReplace.js
+++ b/local-cli/generator/copyProjectTemplateAndReplace.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/generator/printRunInstructions.js b/local-cli/generator/printRunInstructions.js
index d553a73c90d008..cc39a61fd3e677 100644
--- a/local-cli/generator/printRunInstructions.js
+++ b/local-cli/generator/printRunInstructions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/generator/templates.js b/local-cli/generator/templates.js
index cc7145c2397d26..98e2897a5d0212 100644
--- a/local-cli/generator/templates.js
+++ b/local-cli/generator/templates.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/info/info.js b/local-cli/info/info.js
index ac423da27ba103..d5e4284fe0b65e 100644
--- a/local-cli/info/info.js
+++ b/local-cli/info/info.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/init/init.js b/local-cli/init/init.js
index 7ea2f363230259..d0233b1ab810db 100644
--- a/local-cli/init/init.js
+++ b/local-cli/init/init.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/install/install.js b/local-cli/install/install.js
index b3d55312a9096a..2efc64978d0541 100644
--- a/local-cli/install/install.js
+++ b/local-cli/install/install.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/install/uninstall.js b/local-cli/install/uninstall.js
index a45d11a06ae8d1..0d6fc5ed755bf9 100644
--- a/local-cli/install/uninstall.js
+++ b/local-cli/install/uninstall.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/library/library.js b/local-cli/library/library.js
index 9dacc1134eb969..14afd6a4059b7f 100644
--- a/local-cli/library/library.js
+++ b/local-cli/library/library.js
@@ -1,10 +1,8 @@
  /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
@@ -31,7 +29,7 @@ function library(argv, config, args) {
   const source = path.resolve('node_modules', 'react-native', 'Libraries', 'Sample');
 
   if (!fs.existsSync(libraries)) {
-    fs.mkdir(libraries);
+    fs.mkdirSync(libraries);
   }
 
   if (fs.existsSync(libraryDest)) {
diff --git a/local-cli/link/__tests__/android/applyPatch.spec.js b/local-cli/link/__tests__/android/applyPatch.spec.js
index 000743f1484d76..b1213dbf315faa 100644
--- a/local-cli/link/__tests__/android/applyPatch.spec.js
+++ b/local-cli/link/__tests__/android/applyPatch.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/android/isInstalled.spec.js b/local-cli/link/__tests__/android/isInstalled.spec.js
index f87f0d14bf9cee..131d753731afea 100644
--- a/local-cli/link/__tests__/android/isInstalled.spec.js
+++ b/local-cli/link/__tests__/android/isInstalled.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/android/makeBuildPatch.spec.js b/local-cli/link/__tests__/android/makeBuildPatch.spec.js
index e731bc4e477d2f..0fd082da91f650 100644
--- a/local-cli/link/__tests__/android/makeBuildPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeBuildPatch.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/android/makeImportPatch.spec.js b/local-cli/link/__tests__/android/makeImportPatch.spec.js
index b41775c8c7d845..d02eb66898555f 100644
--- a/local-cli/link/__tests__/android/makeImportPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeImportPatch.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/android/makePackagePatch.spec.js b/local-cli/link/__tests__/android/makePackagePatch.spec.js
index 8407fe6ed076ad..c7e55c7e90f2b0 100644
--- a/local-cli/link/__tests__/android/makePackagePatch.spec.js
+++ b/local-cli/link/__tests__/android/makePackagePatch.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/android/makeSettingsPatch.spec.js b/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
index 1ca5681217bfb6..a8c7e3c2ba8d4f 100644
--- a/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/android/makeStringsPatch.spec.js b/local-cli/link/__tests__/android/makeStringsPatch.spec.js
index 4232ba789f6bbc..3015f15b340bef 100644
--- a/local-cli/link/__tests__/android/makeStringsPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeStringsPatch.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/getDependencyConfig.spec.js b/local-cli/link/__tests__/getDependencyConfig.spec.js
index 87cf12755d4a6d..30db06d537fc30 100644
--- a/local-cli/link/__tests__/getDependencyConfig.spec.js
+++ b/local-cli/link/__tests__/getDependencyConfig.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/getProjectDependencies.spec.js b/local-cli/link/__tests__/getProjectDependencies.spec.js
index 28ad2a61ac0b89..fc7dd3cd91dd69 100644
--- a/local-cli/link/__tests__/getProjectDependencies.spec.js
+++ b/local-cli/link/__tests__/getProjectDependencies.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/groupFilesByType.spec.js b/local-cli/link/__tests__/groupFilesByType.spec.js
index 2154583d5b4211..a96ff6e24d3827 100644
--- a/local-cli/link/__tests__/groupFilesByType.spec.js
+++ b/local-cli/link/__tests__/groupFilesByType.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/addFileToProject.spec.js b/local-cli/link/__tests__/ios/addFileToProject.spec.js
index 335e53e37954c0..ca32c867090ca7 100644
--- a/local-cli/link/__tests__/ios/addFileToProject.spec.js
+++ b/local-cli/link/__tests__/ios/addFileToProject.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js b/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
index 4c7858f4eda302..4d20621e0afd24 100644
--- a/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
+++ b/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/addSharedLibraries.spec.js b/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
index 58bff8c6abc55b..36343a89ce6462 100644
--- a/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
+++ b/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/createGroup.spec.js b/local-cli/link/__tests__/ios/createGroup.spec.js
index 5f1bf4424608a2..b3fbf67a1a1fdf 100644
--- a/local-cli/link/__tests__/ios/createGroup.spec.js
+++ b/local-cli/link/__tests__/ios/createGroup.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/getBuildProperty.spec.js b/local-cli/link/__tests__/ios/getBuildProperty.spec.js
index fbe9fd49b2de42..831944bbb94de0 100644
--- a/local-cli/link/__tests__/ios/getBuildProperty.spec.js
+++ b/local-cli/link/__tests__/ios/getBuildProperty.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/getGroup.spec.js b/local-cli/link/__tests__/ios/getGroup.spec.js
index 9569a998f08751..f46cc31ebd7cdf 100644
--- a/local-cli/link/__tests__/ios/getGroup.spec.js
+++ b/local-cli/link/__tests__/ios/getGroup.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js b/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
index e63de35cb3bf24..7e96a20b0edc44 100644
--- a/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
+++ b/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js b/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
index 8d2830ed834dc2..ff106865791441 100644
--- a/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
+++ b/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/getPlist.spec.js b/local-cli/link/__tests__/ios/getPlist.spec.js
index df900c19224525..156320079b8a39 100644
--- a/local-cli/link/__tests__/ios/getPlist.spec.js
+++ b/local-cli/link/__tests__/ios/getPlist.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/getPlistPath.spec.js b/local-cli/link/__tests__/ios/getPlistPath.spec.js
index 783cbb26c0c486..bf7c922edc89f4 100644
--- a/local-cli/link/__tests__/ios/getPlistPath.spec.js
+++ b/local-cli/link/__tests__/ios/getPlistPath.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/getProducts.spec.js b/local-cli/link/__tests__/ios/getProducts.spec.js
index 93bc0fcca66d41..26bee69fca00d4 100644
--- a/local-cli/link/__tests__/ios/getProducts.spec.js
+++ b/local-cli/link/__tests__/ios/getProducts.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/getTargets.spec.js b/local-cli/link/__tests__/ios/getTargets.spec.js
index 77bdf39bce4ec9..99f3f370215eca 100644
--- a/local-cli/link/__tests__/ios/getTargets.spec.js
+++ b/local-cli/link/__tests__/ios/getTargets.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/hasLibraryImported.spec.js b/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
index 8882ac2f8dd619..6d9d1723f9032c 100644
--- a/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
+++ b/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/isInstalled.spec.js b/local-cli/link/__tests__/ios/isInstalled.spec.js
index 45c9a05d2280f4..bc291d79df3416 100644
--- a/local-cli/link/__tests__/ios/isInstalled.spec.js
+++ b/local-cli/link/__tests__/ios/isInstalled.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js b/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
index 0f2b743d21261b..e834b32da8cb9f 100644
--- a/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
+++ b/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/removeProjectFromLibraries.js b/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
index 5328291a1f3e42..262d61b11e8efc 100644
--- a/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
+++ b/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js b/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
index adb4eac7fd016c..54a3e07cd7aa14 100644
--- a/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
+++ b/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js b/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
index ece8b176ef1d16..601f0f7aa57573 100644
--- a/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
+++ b/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/writePlist.spec.js b/local-cli/link/__tests__/ios/writePlist.spec.js
index 29ea0bfd7d72e4..0d2e086d00132e 100644
--- a/local-cli/link/__tests__/ios/writePlist.spec.js
+++ b/local-cli/link/__tests__/ios/writePlist.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/link.spec.js b/local-cli/link/__tests__/link.spec.js
index b3470563d7ce40..5ff3ab73a19ebe 100644
--- a/local-cli/link/__tests__/link.spec.js
+++ b/local-cli/link/__tests__/link.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
@@ -81,8 +79,10 @@ describe('link', () => {
   it('should register native module when android/ios projects are present', (done) => {
     const registerNativeModule = sinon.stub();
     const dependencyConfig = {android: {}, ios: {}, assets: [], commands: {}};
+    const androidLinkConfig = require('../android');
+    const iosLinkConfig = require('../ios');
     const config = {
-      getPlatformConfig: () => ({ios: {}, android: {}}),
+      getPlatformConfig: () => ({ios: { linkConfig: iosLinkConfig }, android: { linkConfig: androidLinkConfig }}),
       getProjectConfig: () => ({android: {}, ios: {}, assets: []}),
       getDependencyConfig: sinon.stub().returns(dependencyConfig),
     };
@@ -223,8 +223,9 @@ describe('link', () => {
       sinon.stub().returns(false)
     );
 
+    const linkConfig = require('../ios');
     const config = {
-      getPlatformConfig: () => ({ ios: {}}),
+      getPlatformConfig: () => ({ ios: { linkConfig: linkConfig }}),
       getProjectConfig: () => ({ ios: {}, assets: [] }),
       getDependencyConfig: sinon.stub().returns({
         ios: {}, assets: [], commands: { prelink, postlink },
@@ -251,8 +252,9 @@ describe('link', () => {
       copyAssets
     );
 
+    const linkConfig = require('../ios');
     const config = {
-      getPlatformConfig: () => ({ ios: {} }),
+      getPlatformConfig: () => ({ ios: { linkConfig: linkConfig } }),
       getProjectConfig: () => ({ ios: {}, assets: projectAssets }),
       getDependencyConfig: sinon.stub().returns(dependencyConfig),
     };
diff --git a/local-cli/link/__tests__/pods/findLineToAddPod.spec.js b/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
index 3940136a9920de..e065fd406ffe7b 100644
--- a/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
+++ b/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js b/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
index 9e2a8bed8e4c2e..f3b6880949f49a 100644
--- a/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
+++ b/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/pods/findPodTargetLine.spec.js b/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
index 1d382315d7cad2..d64a2513c7cc5f 100644
--- a/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
+++ b/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/pods/isInstalled.spec.js b/local-cli/link/__tests__/pods/isInstalled.spec.js
index 1060baa456199f..abda0fbe32d6c6 100644
--- a/local-cli/link/__tests__/pods/isInstalled.spec.js
+++ b/local-cli/link/__tests__/pods/isInstalled.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/pods/removePodEntry.spec.js b/local-cli/link/__tests__/pods/removePodEntry.spec.js
index aa8fd5a26a34b8..5c2f4a951f02bd 100644
--- a/local-cli/link/__tests__/pods/removePodEntry.spec.js
+++ b/local-cli/link/__tests__/pods/removePodEntry.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/promiseWaterfall.spec.js b/local-cli/link/__tests__/promiseWaterfall.spec.js
index ca1d30db1a427d..d34aa650217772 100644
--- a/local-cli/link/__tests__/promiseWaterfall.spec.js
+++ b/local-cli/link/__tests__/promiseWaterfall.spec.js
@@ -1,12 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * All rights reserved.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/android/copyAssets.js b/local-cli/link/android/copyAssets.js
index 0f41a301c63b9a..f4bd67ff6a1e54 100644
--- a/local-cli/link/android/copyAssets.js
+++ b/local-cli/link/android/copyAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs-extra');
@@ -17,10 +15,10 @@ const groupFilesByType = require('../groupFilesByType');
  * For now, the only types of files that are handled are:
  * - Fonts (otf, ttf) - copied to targetPath/fonts under original name
  */
-module.exports = function copyAssetsAndroid(files, targetPath) {
+module.exports = function copyAssetsAndroid(files, project) {
   const assets = groupFilesByType(files);
 
   (assets.font || []).forEach(asset =>
-    fs.copySync(asset, path.join(targetPath, 'fonts', path.basename(asset)))
+    fs.copySync(asset, path.join(project.assetsPath, 'fonts', path.basename(asset)))
   );
 };
diff --git a/local-cli/link/android/fs.js b/local-cli/link/android/fs.js
index b485a9ebfbd168..9ace2aba924f03 100644
--- a/local-cli/link/android/fs.js
+++ b/local-cli/link/android/fs.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs-extra');
diff --git a/local-cli/link/android/index.js b/local-cli/link/android/index.js
new file mode 100644
index 00000000000000..986ec59450b8dd
--- /dev/null
+++ b/local-cli/link/android/index.js
@@ -0,0 +1,9 @@
+module.exports = function() {
+  return {
+    isInstalled: require('./isInstalled'),
+    register: require('./registerNativeModule'),
+    unregister: require('./unregisterNativeModule'),
+    copyAssets: require('./copyAssets'),
+    unlinkAssets: require('./unlinkAssets')
+  };
+};
diff --git a/local-cli/link/android/isInstalled.js b/local-cli/link/android/isInstalled.js
index c191c0f68c5fdd..2accb2a0160d21 100644
--- a/local-cli/link/android/isInstalled.js
+++ b/local-cli/link/android/isInstalled.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs');
diff --git a/local-cli/link/android/patches/applyParams.js b/local-cli/link/android/patches/applyParams.js
index 4574399d22d4b9..5f57f3cb8fa891 100644
--- a/local-cli/link/android/patches/applyParams.js
+++ b/local-cli/link/android/patches/applyParams.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const toCamelCase = require('lodash').camelCase;
diff --git a/local-cli/link/android/patches/applyPatch.js b/local-cli/link/android/patches/applyPatch.js
index bc6396602dac78..df9680c507236e 100644
--- a/local-cli/link/android/patches/applyPatch.js
+++ b/local-cli/link/android/patches/applyPatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs');
diff --git a/local-cli/link/android/patches/makeBuildPatch.js b/local-cli/link/android/patches/makeBuildPatch.js
index 473ab291cf0646..67f7d8aac3f1d2 100644
--- a/local-cli/link/android/patches/makeBuildPatch.js
+++ b/local-cli/link/android/patches/makeBuildPatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = function makeBuildPatch(name) {
diff --git a/local-cli/link/android/patches/makeImportPatch.js b/local-cli/link/android/patches/makeImportPatch.js
index 219242e6dcd036..9cb9aaddc995e2 100644
--- a/local-cli/link/android/patches/makeImportPatch.js
+++ b/local-cli/link/android/patches/makeImportPatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = function makeImportPatch(packageImportPath) {
diff --git a/local-cli/link/android/patches/makePackagePatch.js b/local-cli/link/android/patches/makePackagePatch.js
index 7789cbc4deae0a..054c2ac5649b79 100644
--- a/local-cli/link/android/patches/makePackagePatch.js
+++ b/local-cli/link/android/patches/makePackagePatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const applyParams = require('./applyParams');
diff --git a/local-cli/link/android/patches/makeSettingsPatch.js b/local-cli/link/android/patches/makeSettingsPatch.js
index 5b0983a9304d9d..a8a6e148333f04 100644
--- a/local-cli/link/android/patches/makeSettingsPatch.js
+++ b/local-cli/link/android/patches/makeSettingsPatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const path = require('path');
diff --git a/local-cli/link/android/patches/makeStringsPatch.js b/local-cli/link/android/patches/makeStringsPatch.js
index a8a2981a12970c..281582afb97167 100644
--- a/local-cli/link/android/patches/makeStringsPatch.js
+++ b/local-cli/link/android/patches/makeStringsPatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const toCamelCase = require('lodash').camelCase;
diff --git a/local-cli/link/android/patches/revokePatch.js b/local-cli/link/android/patches/revokePatch.js
index 037e2a13052fa3..9437e56cb08834 100644
--- a/local-cli/link/android/patches/revokePatch.js
+++ b/local-cli/link/android/patches/revokePatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs');
diff --git a/local-cli/link/android/registerNativeModule.js b/local-cli/link/android/registerNativeModule.js
index f6d37b5519c36b..0ce77c4e6ed4da 100644
--- a/local-cli/link/android/registerNativeModule.js
+++ b/local-cli/link/android/registerNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const applyPatch = require('./patches/applyPatch');
diff --git a/local-cli/link/android/unlinkAssets.js b/local-cli/link/android/unlinkAssets.js
index 6c8b02191ecd9e..b0eeefed93c357 100644
--- a/local-cli/link/android/unlinkAssets.js
+++ b/local-cli/link/android/unlinkAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs-extra');
@@ -17,11 +15,11 @@ const groupFilesByType = require('../groupFilesByType');
  * For now, the only types of files that are handled are:
  * - Fonts (otf, ttf) - copied to targetPath/fonts under original name
  */
-module.exports = function unlinkAssetsAndroid(files, targetPath) {
+module.exports = function unlinkAssetsAndroid(files, project) {
   const assets = groupFilesByType(files);
 
   (assets.font || []).forEach((file) => {
-    const filePath = path.join(targetPath, 'fonts', path.basename(file));
+    const filePath = path.join(project.assetsPath, 'fonts', path.basename(file));
     if (fs.existsSync(filePath)) {
       fs.unlinkSync(filePath);
     }
diff --git a/local-cli/link/android/unregisterNativeModule.js b/local-cli/link/android/unregisterNativeModule.js
index 51eb157858036c..b6b8d166531841 100644
--- a/local-cli/link/android/unregisterNativeModule.js
+++ b/local-cli/link/android/unregisterNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs');
diff --git a/local-cli/link/commandStub.js b/local-cli/link/commandStub.js
index 7529fe4ed9fcbd..13078bd3404f10 100644
--- a/local-cli/link/commandStub.js
+++ b/local-cli/link/commandStub.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = (cb) => cb();
diff --git a/local-cli/link/getDependencyConfig.js b/local-cli/link/getDependencyConfig.js
index 751f746a8881c9..71ce26590906ea 100644
--- a/local-cli/link/getDependencyConfig.js
+++ b/local-cli/link/getDependencyConfig.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/getProjectDependencies.js b/local-cli/link/getProjectDependencies.js
index 1d670574ef1f97..1d5b0781a9b866 100644
--- a/local-cli/link/getProjectDependencies.js
+++ b/local-cli/link/getProjectDependencies.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const path = require('path');
diff --git a/local-cli/link/groupFilesByType.js b/local-cli/link/groupFilesByType.js
index 0a5dce030e1395..786c71532e9feb 100644
--- a/local-cli/link/groupFilesByType.js
+++ b/local-cli/link/groupFilesByType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const groupBy = require('lodash').groupBy;
diff --git a/local-cli/link/ios/addFileToProject.js b/local-cli/link/ios/addFileToProject.js
index 3ed3340afb21cd..168220f8038187 100644
--- a/local-cli/link/ios/addFileToProject.js
+++ b/local-cli/link/ios/addFileToProject.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const PbxFile = require('xcode/lib/pbxFile');
diff --git a/local-cli/link/ios/addProjectToLibraries.js b/local-cli/link/ios/addProjectToLibraries.js
index d79f643aaf9226..045697dec1f74d 100644
--- a/local-cli/link/ios/addProjectToLibraries.js
+++ b/local-cli/link/ios/addProjectToLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/addSharedLibraries.js b/local-cli/link/ios/addSharedLibraries.js
index ad29ef9a2dda8f..a0c6f16e649d9f 100644
--- a/local-cli/link/ios/addSharedLibraries.js
+++ b/local-cli/link/ios/addSharedLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const createGroupWithMessage = require('./createGroupWithMessage');
diff --git a/local-cli/link/ios/addToHeaderSearchPaths.js b/local-cli/link/ios/addToHeaderSearchPaths.js
index b3d3e56e21c9a6..579007ecf81c21 100644
--- a/local-cli/link/ios/addToHeaderSearchPaths.js
+++ b/local-cli/link/ios/addToHeaderSearchPaths.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const mapHeaderSearchPaths = require('./mapHeaderSearchPaths');
diff --git a/local-cli/link/ios/common/isInstalled.js b/local-cli/link/ios/common/isInstalled.js
new file mode 100644
index 00000000000000..69bcd8bdf32d88
--- /dev/null
+++ b/local-cli/link/ios/common/isInstalled.js
@@ -0,0 +1,6 @@
+const isInstalledIOS = require('../isInstalled');
+const isInstalledPods = require('../../pods/isInstalled');
+
+module.exports = function isInstalled(projectConfig, name, dependencyConfig) {
+  return isInstalledIOS(projectConfig, dependencyConfig) || isInstalledPods(projectConfig, dependencyConfig);
+};
diff --git a/local-cli/link/ios/common/registerNativeModule.js b/local-cli/link/ios/common/registerNativeModule.js
new file mode 100644
index 00000000000000..38ce59606982ca
--- /dev/null
+++ b/local-cli/link/ios/common/registerNativeModule.js
@@ -0,0 +1,16 @@
+const registerDependencyIOS = require('../registerNativeModule');
+const registerDependencyPods = require('../../pods/registerNativeModule');
+
+module.exports = function registerNativeModule(
+  name,
+  dependencyConfig,
+  params,
+  projectConfig
+) {
+  if (projectConfig.podfile && dependencyConfig.podspec) {
+    registerDependencyPods(name, dependencyConfig, projectConfig);
+  }
+  else {
+    registerDependencyIOS(dependencyConfig, projectConfig);
+  }
+};
diff --git a/local-cli/link/ios/common/unregisterNativeModule.js b/local-cli/link/ios/common/unregisterNativeModule.js
new file mode 100644
index 00000000000000..e6d34ada4cce95
--- /dev/null
+++ b/local-cli/link/ios/common/unregisterNativeModule.js
@@ -0,0 +1,22 @@
+const compact = require('lodash').compact;
+const isInstalledIOS = require('../isInstalled');
+const isInstalledPods = require('../../pods/isInstalled');
+const unregisterDependencyIOS = require('../unregisterNativeModule');
+const unregisterDependencyPods = require('../../pods/unregisterNativeModule');
+
+module.exports = function unregisterNativeModule(
+  name,
+  dependencyConfig,
+  projectConfig,
+  otherDependencies
+) {
+  const isIosInstalled = isInstalledIOS(projectConfig, dependencyConfig);
+  const isPodInstalled = isInstalledPods(projectConfig, dependencyConfig);
+  if (isIosInstalled) {
+    const iOSDependencies = compact(otherDependencies.map(d => d.config.ios));
+    unregisterDependencyIOS(dependencyConfig, projectConfig, iOSDependencies);
+  }
+  else if (isPodInstalled) {
+    unregisterDependencyPods(dependencyConfig, projectConfig);
+  }
+};
diff --git a/local-cli/link/ios/copyAssets.js b/local-cli/link/ios/copyAssets.js
index dec1cb0c9962c2..8f6d2b86eb1309 100644
--- a/local-cli/link/ios/copyAssets.js
+++ b/local-cli/link/ios/copyAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs-extra');
diff --git a/local-cli/link/ios/createGroup.js b/local-cli/link/ios/createGroup.js
index 586e933b8c9e0d..62f79e1c9742c1 100644
--- a/local-cli/link/ios/createGroup.js
+++ b/local-cli/link/ios/createGroup.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const getGroup = require('./getGroup');
diff --git a/local-cli/link/ios/createGroupWithMessage.js b/local-cli/link/ios/createGroupWithMessage.js
index e782813009d8ad..4b598940da95a8 100644
--- a/local-cli/link/ios/createGroupWithMessage.js
+++ b/local-cli/link/ios/createGroupWithMessage.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const log = require('npmlog');
diff --git a/local-cli/link/ios/getBuildProperty.js b/local-cli/link/ios/getBuildProperty.js
index 6fc82fe496da54..bb1c7b78b88fa7 100644
--- a/local-cli/link/ios/getBuildProperty.js
+++ b/local-cli/link/ios/getBuildProperty.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/getGroup.js b/local-cli/link/ios/getGroup.js
index dd64332a42fa32..c66205be0117b8 100644
--- a/local-cli/link/ios/getGroup.js
+++ b/local-cli/link/ios/getGroup.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const getFirstProject = (project) => project.getFirstProject().firstProject;
diff --git a/local-cli/link/ios/getHeaderSearchPath.js b/local-cli/link/ios/getHeaderSearchPath.js
index 9857bb62f46c36..c5f2572c622165 100644
--- a/local-cli/link/ios/getHeaderSearchPath.js
+++ b/local-cli/link/ios/getHeaderSearchPath.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const path = require('path');
diff --git a/local-cli/link/ios/getHeadersInFolder.js b/local-cli/link/ios/getHeadersInFolder.js
index b0426f01a4775a..a4c2250ab47c05 100644
--- a/local-cli/link/ios/getHeadersInFolder.js
+++ b/local-cli/link/ios/getHeadersInFolder.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const glob = require('glob');
diff --git a/local-cli/link/ios/getPlist.js b/local-cli/link/ios/getPlist.js
index adc530310fb602..61c877258e9018 100644
--- a/local-cli/link/ios/getPlist.js
+++ b/local-cli/link/ios/getPlist.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const plistParser = require('plist');
diff --git a/local-cli/link/ios/getPlistPath.js b/local-cli/link/ios/getPlistPath.js
index a82d086fd3ae1e..0609f5f581f95b 100644
--- a/local-cli/link/ios/getPlistPath.js
+++ b/local-cli/link/ios/getPlistPath.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const path = require('path');
diff --git a/local-cli/link/ios/getProducts.js b/local-cli/link/ios/getProducts.js
index 590ff831431906..7e24f15826beea 100644
--- a/local-cli/link/ios/getProducts.js
+++ b/local-cli/link/ios/getProducts.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/getTargets.js b/local-cli/link/ios/getTargets.js
index b2441e9acf2c8b..784eed2177f3f4 100644
--- a/local-cli/link/ios/getTargets.js
+++ b/local-cli/link/ios/getTargets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
@@ -24,6 +22,6 @@ module.exports = function getTargets(project) {
       target: nativeTargetSection[key],
         name: nativeTargetSection[key].productReference_comment,
       isTVOS: (buildConfiguration.buildSettings.SDKROOT && (buildConfiguration.buildSettings.SDKROOT.indexOf('appletv') !== -1)) || false
-    }
+    };
   });
 };
diff --git a/local-cli/link/ios/hasLibraryImported.js b/local-cli/link/ios/hasLibraryImported.js
index 077591a7c991c0..0372f0b4b920e2 100644
--- a/local-cli/link/ios/hasLibraryImported.js
+++ b/local-cli/link/ios/hasLibraryImported.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/index.js b/local-cli/link/ios/index.js
new file mode 100644
index 00000000000000..9653b3be80a1d1
--- /dev/null
+++ b/local-cli/link/ios/index.js
@@ -0,0 +1,9 @@
+module.exports = function() {
+  return {
+    isInstalled: require('./common/isInstalled'),
+    register: require('./common/registerNativeModule'),
+    unregister: require('./common/unregisterNativeModule'),
+    copyAssets: require('./copyAssets'),
+    unlinkAssets: require('./unlinkAssets')
+  };
+};
diff --git a/local-cli/link/ios/isInstalled.js b/local-cli/link/ios/isInstalled.js
index 095925688c4e37..7b0e4a94672ab8 100644
--- a/local-cli/link/ios/isInstalled.js
+++ b/local-cli/link/ios/isInstalled.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const xcode = require('xcode');
diff --git a/local-cli/link/ios/mapHeaderSearchPaths.js b/local-cli/link/ios/mapHeaderSearchPaths.js
index f31c2d1507c325..cb2a583f25f450 100644
--- a/local-cli/link/ios/mapHeaderSearchPaths.js
+++ b/local-cli/link/ios/mapHeaderSearchPaths.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/registerNativeModule.js b/local-cli/link/ios/registerNativeModule.js
index 74b828548f4cb9..fed2b0bb2cfc55 100644
--- a/local-cli/link/ios/registerNativeModule.js
+++ b/local-cli/link/ios/registerNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const xcode = require('xcode');
@@ -48,8 +46,8 @@ module.exports = function registerNativeModuleIOS(dependencyConfig, projectConfi
   getTargets(dependencyProject).forEach(product => {
     var i;
     if (!product.isTVOS) {
-      for (i=0; i<targets.length; i++) {
-        if(!targets[i].isTVOS) {
+      for (i = 0; i < targets.length; i++) {
+        if (!targets[i].isTVOS) {
           project.addStaticLibrary(product.name, {
             target: targets[i].uuid
           });
@@ -58,8 +56,8 @@ module.exports = function registerNativeModuleIOS(dependencyConfig, projectConfi
     }
 
     if (product.isTVOS) {
-      for (i=0; i<targets.length; i++) {
-        if(targets[i].isTVOS) {
+      for (i = 0; i < targets.length; i++) {
+        if (targets[i].isTVOS) {
           project.addStaticLibrary(product.name, {
             target: targets[i].uuid
           });
diff --git a/local-cli/link/ios/removeFromHeaderSearchPaths.js b/local-cli/link/ios/removeFromHeaderSearchPaths.js
index 9dbe99e3643710..f662991210c251 100644
--- a/local-cli/link/ios/removeFromHeaderSearchPaths.js
+++ b/local-cli/link/ios/removeFromHeaderSearchPaths.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const mapHeaderSearchPaths = require('./mapHeaderSearchPaths');
diff --git a/local-cli/link/ios/removeFromPbxItemContainerProxySection.js b/local-cli/link/ios/removeFromPbxItemContainerProxySection.js
index ee5e31777efb98..44a3fb2db83fdb 100644
--- a/local-cli/link/ios/removeFromPbxItemContainerProxySection.js
+++ b/local-cli/link/ios/removeFromPbxItemContainerProxySection.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/removeFromPbxReferenceProxySection.js b/local-cli/link/ios/removeFromPbxReferenceProxySection.js
index 09561896e2a012..ba3626b796cb36 100644
--- a/local-cli/link/ios/removeFromPbxReferenceProxySection.js
+++ b/local-cli/link/ios/removeFromPbxReferenceProxySection.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/removeFromProjectReferences.js b/local-cli/link/ios/removeFromProjectReferences.js
index b0c9eada9cebda..5edc858807f991 100644
--- a/local-cli/link/ios/removeFromProjectReferences.js
+++ b/local-cli/link/ios/removeFromProjectReferences.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/removeFromStaticLibraries.js b/local-cli/link/ios/removeFromStaticLibraries.js
index 861d319f14415c..391088c15702f4 100644
--- a/local-cli/link/ios/removeFromStaticLibraries.js
+++ b/local-cli/link/ios/removeFromStaticLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const PbxFile = require('xcode/lib/pbxFile');
diff --git a/local-cli/link/ios/removeProductGroup.js b/local-cli/link/ios/removeProductGroup.js
index 6326540b638b0d..888f2a44200601 100644
--- a/local-cli/link/ios/removeProductGroup.js
+++ b/local-cli/link/ios/removeProductGroup.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = function removeProductGroup(project, productGroupId) {
diff --git a/local-cli/link/ios/removeProjectFromLibraries.js b/local-cli/link/ios/removeProjectFromLibraries.js
index 48b356c81a7529..9eaee4758bf87f 100644
--- a/local-cli/link/ios/removeProjectFromLibraries.js
+++ b/local-cli/link/ios/removeProjectFromLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/removeProjectFromProject.js b/local-cli/link/ios/removeProjectFromProject.js
index e9f2379a051679..cb7c1711497439 100644
--- a/local-cli/link/ios/removeProjectFromProject.js
+++ b/local-cli/link/ios/removeProjectFromProject.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const PbxFile = require('xcode/lib/pbxFile');
diff --git a/local-cli/link/ios/removeSharedLibraries.js b/local-cli/link/ios/removeSharedLibraries.js
index 6da91f119668a8..dd2629ebb03c6b 100644
--- a/local-cli/link/ios/removeSharedLibraries.js
+++ b/local-cli/link/ios/removeSharedLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = function removeSharedLibraries(project, libraries) {
diff --git a/local-cli/link/ios/unlinkAssets.js b/local-cli/link/ios/unlinkAssets.js
index 083519e38fe816..a7c38446f4ce61 100644
--- a/local-cli/link/ios/unlinkAssets.js
+++ b/local-cli/link/ios/unlinkAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs-extra');
diff --git a/local-cli/link/ios/unregisterNativeModule.js b/local-cli/link/ios/unregisterNativeModule.js
index 8f09484cff9434..b35a6c31aefa13 100644
--- a/local-cli/link/ios/unregisterNativeModule.js
+++ b/local-cli/link/ios/unregisterNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const xcode = require('xcode');
diff --git a/local-cli/link/ios/writePlist.js b/local-cli/link/ios/writePlist.js
index c7d424fcddb627..0c025d2e9d2277 100644
--- a/local-cli/link/ios/writePlist.js
+++ b/local-cli/link/ios/writePlist.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const plistParser = require('plist');
diff --git a/local-cli/link/link.js b/local-cli/link/link.js
index ac0aba2a679ebd..66e9efbf563c8e 100644
--- a/local-cli/link/link.js
+++ b/local-cli/link/link.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
@@ -26,14 +24,6 @@ const chalk = require('chalk');
  * run Flow. */
 const isEmpty = require('lodash').isEmpty;
 const promiseWaterfall = require('./promiseWaterfall');
-const registerDependencyAndroid = require('./android/registerNativeModule');
-const registerDependencyIOS = require('./ios/registerNativeModule');
-const registerDependencyPods = require('./pods/registerNativeModule');
-const isInstalledAndroid = require('./android/isInstalled');
-const isInstalledIOS = require('./ios/isInstalled');
-const isInstalledPods = require('./pods/isInstalled');
-const copyAssetsAndroid = require('./android/copyAssets');
-const copyAssetsIOS = require('./ios/copyAssets');
 const getProjectDependencies = require('./getProjectDependencies');
 const getDependencyConfig = require('./getDependencyConfig');
 const pollParams = require('./pollParams');
@@ -47,37 +37,10 @@ log.heading = 'rnpm-link';
 
 const dedupeAssets = (assets) => uniqBy(assets, asset => path.basename(asset));
 
+const linkDependency = async (platforms, project, dependency) => {
+  const params = await pollParams(dependency.config.params);
 
-const linkDependencyAndroid = (androidProject, dependency) => {
-  if (!androidProject || !dependency.config.android) {
-    return null;
-  }
-
-  const isInstalled = isInstalledAndroid(androidProject, dependency.name);
-
-  if (isInstalled) {
-    log.info(chalk.grey(`Android module ${dependency.name} is already linked`));
-    return null;
-  }
-
-  return pollParams(dependency.config.params).then(params => {
-    log.info(`Linking ${dependency.name} android dependency`);
-
-    registerDependencyAndroid(
-      dependency.name,
-      dependency.config.android,
-      params,
-      androidProject
-    );
-
-    log.info(`Android module ${dependency.name} has been successfully linked`);
-  });
-};
-
-const linkDependencyPlatforms = (platforms, project, dependency) => {
-  const ignorePlatforms = ['android', 'ios'];
   Object.keys(platforms || {})
-    .filter(platform => ignorePlatforms.indexOf(platform) < 0)
     .forEach(platform => {
       if (!project[platform] || !dependency.config[platform]) {
         return null;
@@ -88,67 +51,32 @@ const linkDependencyPlatforms = (platforms, project, dependency) => {
         return null;
       }
 
-      const isInstalled = linkConfig.isInstalled(project[platform], dependency.config[platform]);
+      const isInstalled = linkConfig.isInstalled(project[platform], dependency.name, dependency.config[platform]);
 
       if (isInstalled) {
         log.info(chalk.grey(`Platform '${platform}' module ${dependency.name} is already linked`));
         return null;
       }
 
-      return pollParams(dependency.config.params).then(params => {
-        log.info(`Linking ${dependency.name} ${platform} dependency`);
+      log.info(`Linking ${dependency.name} ${platform} dependency`);
 
-        linkConfig.register(
-          dependency.name,
-          dependency.config[platform],
-          params,
-          project[platform]
-        );
+      linkConfig.register(
+        dependency.name,
+        dependency.config[platform],
+        params,
+        project[platform]
+      );
 
-        log.info(`Platform '${platform}' module ${dependency.name} has been successfully linked`);
-      });
+      log.info(`Platform '${platform}' module ${dependency.name} has been successfully linked`);
     });
 };
 
-const linkDependencyIOS = (iOSProject, dependency) => {
-  if (!iOSProject || !dependency.config.ios) {
-    return;
-  }
-
-  const isInstalled = isInstalledIOS(iOSProject, dependency.config.ios) || isInstalledPods(iOSProject, dependency.config.ios);
-  if (isInstalled) {
-    log.info(chalk.grey(`iOS module ${dependency.name} is already linked`));
-    return;
-  }
-
-  log.info(`Linking ${dependency.name} ios dependency`);
-  if (iOSProject.podfile && dependency.config.ios.podspec) {
-    registerDependencyPods(dependency, iOSProject);
-  }
-  else {
-    registerDependencyIOS(dependency.config.ios, iOSProject);
-  }
-  log.info(`iOS module ${dependency.name} has been successfully linked`);
-};
-
 const linkAssets = (platforms, project, assets) => {
   if (isEmpty(assets)) {
     return;
   }
 
-  if (project.ios) {
-    log.info('Linking assets to ios project');
-    copyAssetsIOS(assets, project.ios);
-  }
-
-  if (project.android) {
-    log.info('Linking assets to android project');
-    copyAssetsAndroid(assets, project.android.assetsPath);
-  }
-
-  const ignorePlatforms = ['android', 'ios'];
   Object.keys(platforms || {})
-    .filter(platform => ignorePlatforms.indexOf(platform) < 0)
     .forEach(platform => {
       const linkConfig = platforms[platform] && platforms[platform].linkConfig && platforms[platform].linkConfig();
       if (!linkConfig || !linkConfig.copyAssets) {
@@ -212,9 +140,7 @@ function link(args: Array<string>, config: RNConfig) {
 
   const tasks = flatten(dependencies.map(dependency => [
     () => promisify(dependency.config.commands.prelink || commandStub),
-    () => linkDependencyAndroid(project.android, dependency),
-    () => linkDependencyIOS(project.ios, dependency),
-    () => linkDependencyPlatforms(platforms, project, dependency),
+    () => linkDependency(platforms, project, dependency),
     () => promisify(dependency.config.commands.postlink || commandStub),
   ]));
 
diff --git a/local-cli/link/pods/addPodEntry.js b/local-cli/link/pods/addPodEntry.js
index bc9e2ced1739a7..ea9218623678ed 100644
--- a/local-cli/link/pods/addPodEntry.js
+++ b/local-cli/link/pods/addPodEntry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/findLineToAddPod.js b/local-cli/link/pods/findLineToAddPod.js
index f275f1c3f79855..dca2e391cc482a 100644
--- a/local-cli/link/pods/findLineToAddPod.js
+++ b/local-cli/link/pods/findLineToAddPod.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/findMarkedLinesInPodfile.js b/local-cli/link/pods/findMarkedLinesInPodfile.js
index 8d084987e7b87b..42ef7c8bedd44b 100644
--- a/local-cli/link/pods/findMarkedLinesInPodfile.js
+++ b/local-cli/link/pods/findMarkedLinesInPodfile.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/findPodTargetLine.js b/local-cli/link/pods/findPodTargetLine.js
index fea3b38c835c03..d5a8c97fb2b31c 100644
--- a/local-cli/link/pods/findPodTargetLine.js
+++ b/local-cli/link/pods/findPodTargetLine.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/isInstalled.js b/local-cli/link/pods/isInstalled.js
index 59072a2762e61e..251376541d14c7 100644
--- a/local-cli/link/pods/isInstalled.js
+++ b/local-cli/link/pods/isInstalled.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/readPodfile.js b/local-cli/link/pods/readPodfile.js
index a0b85cc3d27955..85ac7ed9bf3dee 100644
--- a/local-cli/link/pods/readPodfile.js
+++ b/local-cli/link/pods/readPodfile.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/registerNativeModule.js b/local-cli/link/pods/registerNativeModule.js
index 1032f244861228..b00d93c6f2d6d8 100644
--- a/local-cli/link/pods/registerNativeModule.js
+++ b/local-cli/link/pods/registerNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
@@ -16,10 +14,10 @@ const findMarkedLinesInPodfile = require('./findMarkedLinesInPodfile');
 const addPodEntry = require('./addPodEntry');
 const savePodFile = require('./savePodFile');
 
-module.exports = function registerNativeModulePods(dependency, iOSProject) {
+module.exports = function registerNativeModulePods(name, dependencyConfig, iOSProject) {
   const podLines = readPodfile(iOSProject.podfile);
   const linesToAddEntry = getLinesToAddEntry(podLines, iOSProject);
-  addPodEntry(podLines, linesToAddEntry, dependency.config.ios.podspec, dependency.name);
+  addPodEntry(podLines, linesToAddEntry, dependencyConfig.podspec, name);
   savePodFile(iOSProject.podfile, podLines);
 };
 
diff --git a/local-cli/link/pods/removePodEntry.js b/local-cli/link/pods/removePodEntry.js
index 490a2300a1a957..8af044734d3121 100644
--- a/local-cli/link/pods/removePodEntry.js
+++ b/local-cli/link/pods/removePodEntry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/savePodFile.js b/local-cli/link/pods/savePodFile.js
index dbd98686f6f166..5572311105d591 100644
--- a/local-cli/link/pods/savePodFile.js
+++ b/local-cli/link/pods/savePodFile.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/unregisterNativeModule.js b/local-cli/link/pods/unregisterNativeModule.js
index 10da38f158a7dd..3b2408bf992c8c 100644
--- a/local-cli/link/pods/unregisterNativeModule.js
+++ b/local-cli/link/pods/unregisterNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pollParams.js b/local-cli/link/pollParams.js
index b5e0da823436a6..4c084a6d3ffec7 100644
--- a/local-cli/link/pollParams.js
+++ b/local-cli/link/pollParams.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 var inquirer = require('inquirer');
diff --git a/local-cli/link/promiseWaterfall.js b/local-cli/link/promiseWaterfall.js
index d88135535938bc..fa8b621a9f5a76 100644
--- a/local-cli/link/promiseWaterfall.js
+++ b/local-cli/link/promiseWaterfall.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/promisify.js b/local-cli/link/promisify.js
index 38c0237843d316..665b640f216f7a 100644
--- a/local-cli/link/promisify.js
+++ b/local-cli/link/promisify.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = (func) => new Promise((resolve, reject) =>
diff --git a/local-cli/link/unlink.js b/local-cli/link/unlink.js
index 5c54526dfcc589..91c89ab7ec0844 100644
--- a/local-cli/link/unlink.js
+++ b/local-cli/link/unlink.js
@@ -1,25 +1,14 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const log = require('npmlog');
 
 const getProjectDependencies = require('./getProjectDependencies');
-const unregisterDependencyAndroid = require('./android/unregisterNativeModule');
-const unregisterDependencyIOS = require('./ios/unregisterNativeModule');
-const unregisterDependencyPods = require('./pods/unregisterNativeModule');
-const isInstalledAndroid = require('./android/isInstalled');
-const isInstalledIOS = require('./ios/isInstalled');
-const isInstalledPods = require('./pods/isInstalled');
-const unlinkAssetsAndroid = require('./android/unlinkAssets');
-const unlinkAssetsIOS = require('./ios/unlinkAssets');
 const getDependencyConfig = require('./getDependencyConfig');
-const compact = require('lodash').compact;
 const difference = require('lodash').difference;
 const filter = require('lodash').filter;
 const flatten = require('lodash').flatten;
@@ -30,41 +19,20 @@ const promisify = require('./promisify');
 
 log.heading = 'rnpm-link';
 
-const unlinkDependencyAndroid = (androidProject, dependency, packageName) => {
-  if (!androidProject || !dependency.android) {
-    return;
-  }
-
-  const isInstalled = isInstalledAndroid(androidProject, packageName);
-
-  if (!isInstalled) {
-    log.info(`Android module ${packageName} is not installed`);
-    return;
-  }
-
-  log.info(`Unlinking ${packageName} android dependency`);
-
-  unregisterDependencyAndroid(packageName, dependency.android, androidProject);
+const unlinkDependency = (platforms, project, dependency, packageName, otherDependencies) => {
 
-  log.info(`Android module ${packageName} has been successfully unlinked`);
-};
-
-const unlinkDependencyPlatforms = (platforms, project, dependency, packageName) => {
-
-  const ignorePlatforms = ['android', 'ios'];
   Object.keys(platforms || {})
-    .filter(platform => ignorePlatforms.indexOf(platform) < 0)
     .forEach(platform => {
       if (!project[platform] || !dependency[platform]) {
-        return null;
+        return;
       }
 
       const linkConfig = platforms[platform] && platforms[platform].linkConfig && platforms[platform].linkConfig();
       if (!linkConfig || !linkConfig.isInstalled || !linkConfig.unregister) {
-        return null;
+        return;
       }
 
-      const isInstalled = linkConfig.isInstalled(project[platform], dependency[platform]);
+      const isInstalled = linkConfig.isInstalled(project[platform], packageName, dependency[platform]);
 
       if (!isInstalled) {
         log.info(`Platform '${platform}' module ${packageName} is not installed`);
@@ -76,37 +44,14 @@ const unlinkDependencyPlatforms = (platforms, project, dependency, packageName)
       linkConfig.unregister(
         packageName,
         dependency[platform],
-        project[platform]
+        project[platform],
+        otherDependencies
       );
 
       log.info(`Platform '${platform}' module ${dependency.name} has been successfully unlinked`);
     });
 };
 
-const unlinkDependencyIOS = (iOSProject, dependency, packageName, iOSDependencies) => {
-  if (!iOSProject || !dependency.ios) {
-    return;
-  }
-
-  const isIosInstalled = isInstalledIOS(iOSProject, dependency.ios);
-  const isPodInstalled = isInstalledPods(iOSProject, dependency.ios);
-  if (!isIosInstalled && !isPodInstalled) {
-    log.info(`iOS module ${packageName} is not installed`);
-    return;
-  }
-
-  log.info(`Unlinking ${packageName} ios dependency`);
-
-  if (isIosInstalled) {
-    unregisterDependencyIOS(dependency.ios, iOSProject, iOSDependencies);
-  }
-  else if (isPodInstalled) {
-    unregisterDependencyPods(dependency.ios, iOSProject);
-  }
-
-  log.info(`iOS module ${packageName} has been successfully unlinked`);
-};
-
 /**
  * Updates project and unlink specific dependency
  *
@@ -143,13 +88,10 @@ function unlink(args, config) {
 
   const allDependencies = getDependencyConfig(config, getProjectDependencies());
   const otherDependencies = filter(allDependencies, d => d.name !== packageName);
-  const iOSDependencies = compact(otherDependencies.map(d => d.config.ios));
 
   const tasks = [
     () => promisify(dependency.commands.preunlink || commandStub),
-    () => unlinkDependencyAndroid(project.android, dependency, packageName),
-    () => unlinkDependencyIOS(project.ios, dependency, packageName, iOSDependencies),
-    () => unlinkDependencyPlatforms(platforms, project, dependency, packageName),
+    () => unlinkDependency(platforms, project, dependency, packageName, otherDependencies),
     () => promisify(dependency.commands.postunlink || commandStub)
   ];
 
@@ -166,15 +108,16 @@ function unlink(args, config) {
         return Promise.resolve();
       }
 
-      if (project.ios) {
-        log.info('Unlinking assets from ios project');
-        unlinkAssetsIOS(assets, project.ios);
-      }
+      Object.keys(platforms || {})
+        .forEach(platform => {
+          const linkConfig = platforms[platform] && platforms[platform].linkConfig && platforms[platform].linkConfig();
+          if (!linkConfig || !linkConfig.unlinkAssets) {
+            return;
+          }
 
-      if (project.android) {
-        log.info('Unlinking assets from android project');
-        unlinkAssetsAndroid(assets, project.android.assetsPath);
-      }
+          log.info(`Unlinking assets from ${platform} project`);
+          linkConfig.unlinkAssets(assets, project[platform]);
+        });
 
       log.info(
         `${packageName} assets has been successfully unlinked from your project`
diff --git a/local-cli/logAndroid/logAndroid.js b/local-cli/logAndroid/logAndroid.js
index be3cc12f647af3..7a1aace4bf78b1 100644
--- a/local-cli/logAndroid/logAndroid.js
+++ b/local-cli/logAndroid/logAndroid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/logIOS/logIOS.js b/local-cli/logIOS/logIOS.js
index 0a9fb14615bc7d..3e7b1ffb7c25f2 100644
--- a/local-cli/logIOS/logIOS.js
+++ b/local-cli/logIOS/logIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/runAndroid/adb.js b/local-cli/runAndroid/adb.js
index 221b710af55bed..8206093e3fa867 100644
--- a/local-cli/runAndroid/adb.js
+++ b/local-cli/runAndroid/adb.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/runAndroid/runAndroid.js b/local-cli/runAndroid/runAndroid.js
index d88235d1c40a18..eb17d38210ebb7 100644
--- a/local-cli/runAndroid/runAndroid.js
+++ b/local-cli/runAndroid/runAndroid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/runIOS/__tests__/findMatchingSimulator-test.js b/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
index 8c355b462d15f1..fb3ffddcbe8d4c 100644
--- a/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
+++ b/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
@@ -1,11 +1,9 @@
 /**
  * /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
@@ -57,6 +55,7 @@ describe('findMatchingSimulator', () => {
     )).toEqual({
       udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C',
       name: 'iPhone 6',
+      booted: false,
       version: 'iOS 9.2'
     });
   });
@@ -147,6 +146,7 @@ describe('findMatchingSimulator', () => {
     )).toEqual({
       udid: '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB',
       name: 'iPhone 5',
+      booted: false,
       version: 'iOS 9.2'
     });
   });
@@ -218,6 +218,7 @@ describe('findMatchingSimulator', () => {
     )).toEqual({
       udid: '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB',
       name: 'iPhone 5',
+      booted: false,
       version: 'iOS 9.2'
     });
   });
@@ -263,11 +264,12 @@ describe('findMatchingSimulator', () => {
     )).toEqual({
       udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508',
       name: 'iPhone 6s',
+      booted: true,
       version: 'iOS 9.2'
     });
   });
 
-  it('should return the booted simulator in list even if another device is defined', () => {
+  it('should return the defined simulator in list even if another device is booted', () => {
     expect(findMatchingSimulator({
         'devices': {
           'iOS 9.2': [
@@ -306,8 +308,9 @@ describe('findMatchingSimulator', () => {
       },
       'iPhone 6'
     )).toEqual({
-      udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508',
-      name: 'iPhone 6s',
+      udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C',
+      name: 'iPhone 6',
+      booted: false,
       version: 'iOS 9.2'
     });
   });
@@ -379,11 +382,12 @@ describe('findMatchingSimulator', () => {
     )).toEqual({
       udid: '3A409DC5-5188-42A6-8598-3AA6F34607A5',
       name: 'iPhone 7',
+      booted: true,
       version: 'iOS 10.0'
     });
   });
 
-  it('should return the booted simulator in list even if another device is defined (multi ios versions)', () => {
+  it('should return the defined simulator in list even if another device is booted (multi ios versions)', () => {
     expect(findMatchingSimulator({
         'devices': {
           'iOS 9.2': [
@@ -448,9 +452,10 @@ describe('findMatchingSimulator', () => {
       },
       'iPhone 6s'
     )).toEqual({
-      udid: '3A409DC5-5188-42A6-8598-3AA6F34607A5',
-      name: 'iPhone 7',
-      version: 'iOS 10.0'
+      udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508',
+      name: 'iPhone 6s',
+      booted: false,
+      version: 'iOS 9.2'
     });
   });
 
@@ -483,6 +488,7 @@ describe('findMatchingSimulator', () => {
   )).toEqual({
     udid: '816C30EA-38EA-41AC-BFDA-96FB632D522E',
     name: 'Apple TV',
+    booted: true,
     version: 'tvOS 11.2'
   });
   });
diff --git a/local-cli/runIOS/__tests__/findXcodeProject-test.js b/local-cli/runIOS/__tests__/findXcodeProject-test.js
index 21203d9655fa4d..305605feab23ef 100644
--- a/local-cli/runIOS/__tests__/findXcodeProject-test.js
+++ b/local-cli/runIOS/__tests__/findXcodeProject-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js b/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js
index 6e18b1ec98e327..aea241c8fe374d 100644
--- a/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js
+++ b/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/runIOS/findMatchingSimulator.js b/local-cli/runIOS/findMatchingSimulator.js
index eb14e4b843685f..8b964ec7dba6ba 100644
--- a/local-cli/runIOS/findMatchingSimulator.js
+++ b/local-cli/runIOS/findMatchingSimulator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.*
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
@@ -36,14 +34,12 @@ function findMatchingSimulator(simulators, simulatorName) {
       if (simulator.availability !== '(available)') {
         continue;
       }
-      // If there is a booted simulator, we'll use that as instruments will not boot a second simulator
-      if (simulator.state === 'Booted') {
-        if (simulatorName !== null) {
-          console.warn("We couldn't boot your defined simulator due to an already booted simulator. We are limited to one simulator launched at a time.");
-        }
+      let booted = simulator.state === 'Booted';
+      if (booted && simulatorName === null) {
         return {
           udid: simulator.udid,
           name: simulator.name,
+          booted,
           version
         };
       }
@@ -51,6 +47,7 @@ function findMatchingSimulator(simulators, simulatorName) {
         match = {
           udid: simulator.udid,
           name: simulator.name,
+          booted,
           version
         };
       }
@@ -59,6 +56,7 @@ function findMatchingSimulator(simulators, simulatorName) {
         match = {
           udid: simulator.udid,
           name: simulator.name,
+          booted,
           version
         };
       }
diff --git a/local-cli/runIOS/findXcodeProject.js b/local-cli/runIOS/findXcodeProject.js
index 0d6cd302c6d0a6..ecb80b3d3da1d5 100644
--- a/local-cli/runIOS/findXcodeProject.js
+++ b/local-cli/runIOS/findXcodeProject.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/runIOS/parseIOSDevicesList.js b/local-cli/runIOS/parseIOSDevicesList.js
index 3ccbeac33059d4..d0c10a3a5ea8e7 100644
--- a/local-cli/runIOS/parseIOSDevicesList.js
+++ b/local-cli/runIOS/parseIOSDevicesList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index 37e649ba91d167..e52396b4b1a792 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -1,10 +1,8 @@
 /**
 * Copyright (c) 2015-present, Facebook, Inc.
-* All rights reserved.
 *
-* This source code is licensed under the BSD-style license found in the
-* LICENSE file in the root directory of this source tree. An additional grant
-* of patent rights can be found in the PATENTS file in the same directory.
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
 */
 'use strict';
 
@@ -68,7 +66,7 @@ function runIOS(argv, config, args) {
   if (args.device) {
     const selectedDevice = matchingDevice(devices, args.device);
     if (selectedDevice) {
-      return runOnDevice(selectedDevice, scheme, xcodeProject, args.configuration, args.packager, args.verbose);
+      return runOnDevice(selectedDevice, scheme, xcodeProject, args.configuration, args.packager, args.verbose, args.port);
     } else {
       if (devices && devices.length > 0) {
         console.log('Could not find device with the name: "' + args.device + '".');
@@ -115,24 +113,27 @@ function runOnSimulator(xcodeProject, args, scheme) {
       throw new Error(`Could not find ${args.simulator} simulator`);
     }
 
-    const simulatorFullName = formattedDeviceName(selectedSimulator);
-    console.log(`Launching ${simulatorFullName}...`);
-    try {
-      child_process.spawnSync('xcrun', ['instruments', '-w', selectedSimulator.udid]);
-    } catch (e) {
-      // instruments always fail with 255 because it expects more arguments,
-      // but we want it to only launch the simulator
+    if (!selectedSimulator.booted) {
+      const simulatorFullName = formattedDeviceName(selectedSimulator);
+      console.log(`Launching ${simulatorFullName}...`);
+      try {
+        child_process.spawnSync('xcrun', ['instruments', '-w', selectedSimulator.udid]);
+      } catch (e) {
+        // instruments always fail with 255 because it expects more arguments,
+        // but we want it to only launch the simulator
+      }
     }
-    resolve(selectedSimulator.udid);
+
+    buildProject(xcodeProject, selectedSimulator.udid, scheme, args.configuration, args.packager, args.verbose, args.port)
+      .then((appName) => resolve({ udid: selectedSimulator.udid, appName }));
   })
-  .then((udid) => buildProject(xcodeProject, udid, scheme, args.configuration, args.packager, args.verbose, args.port))
-  .then((appName) => {
+  .then(({udid, appName}) => {
     if (!appName) {
       appName = scheme;
     }
     let appPath = getBuildPath(args.configuration, appName);
     console.log(`Installing ${appPath}`);
-    child_process.spawnSync('xcrun', ['simctl', 'install', 'booted', appPath], {stdio: 'inherit'});
+    child_process.spawnSync('xcrun', ['simctl', 'install', udid, appPath], {stdio: 'inherit'});
 
     const bundleID = child_process.execFileSync(
       '/usr/libexec/PlistBuddy',
@@ -141,7 +142,7 @@ function runOnSimulator(xcodeProject, args, scheme) {
     ).trim();
 
     console.log(`Launching ${bundleID}`);
-    child_process.spawnSync('xcrun', ['simctl', 'launch', 'booted', bundleID], {stdio: 'inherit'});
+    child_process.spawnSync('xcrun', ['simctl', 'launch', udid, bundleID], {stdio: 'inherit'});
   });
 }
 
diff --git a/local-cli/server/checkNodeVersion.js b/local-cli/server/checkNodeVersion.js
index b589304fec1f35..46ec6cdc2f78e5 100644
--- a/local-cli/server/checkNodeVersion.js
+++ b/local-cli/server/checkNodeVersion.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/copyToClipBoardMiddleware.js b/local-cli/server/middleware/copyToClipBoardMiddleware.js
index 4a630c335b2d31..723fbd30c881df 100644
--- a/local-cli/server/middleware/copyToClipBoardMiddleware.js
+++ b/local-cli/server/middleware/copyToClipBoardMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/getDevToolsMiddleware.js b/local-cli/server/middleware/getDevToolsMiddleware.js
index e6621ac57e8383..4a01d964d3fd76 100644
--- a/local-cli/server/middleware/getDevToolsMiddleware.js
+++ b/local-cli/server/middleware/getDevToolsMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  */
diff --git a/local-cli/server/middleware/indexPage.js b/local-cli/server/middleware/indexPage.js
index 1ba7dca5b77c3d..dee12456db2ab2 100644
--- a/local-cli/server/middleware/indexPage.js
+++ b/local-cli/server/middleware/indexPage.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/loadRawBodyMiddleware.js b/local-cli/server/middleware/loadRawBodyMiddleware.js
index 2b59195f415aa7..924275009ebe28 100644
--- a/local-cli/server/middleware/loadRawBodyMiddleware.js
+++ b/local-cli/server/middleware/loadRawBodyMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/openStackFrameInEditorMiddleware.js b/local-cli/server/middleware/openStackFrameInEditorMiddleware.js
index b94598f216f6f5..471c8ed8bbef17 100644
--- a/local-cli/server/middleware/openStackFrameInEditorMiddleware.js
+++ b/local-cli/server/middleware/openStackFrameInEditorMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/statusPageMiddleware.js b/local-cli/server/middleware/statusPageMiddleware.js
index fb793468ff0e0a..cd8fb80200c1e7 100644
--- a/local-cli/server/middleware/statusPageMiddleware.js
+++ b/local-cli/server/middleware/statusPageMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/systraceProfileMiddleware.js b/local-cli/server/middleware/systraceProfileMiddleware.js
index a06f0100a9ddd9..fc1669468f8034 100644
--- a/local-cli/server/middleware/systraceProfileMiddleware.js
+++ b/local-cli/server/middleware/systraceProfileMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/unless.js b/local-cli/server/middleware/unless.js
index c074a6c13f5830..acf0643cf3a05c 100644
--- a/local-cli/server/middleware/unless.js
+++ b/local-cli/server/middleware/unless.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 1288d769b73102..371f43a39af560 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
@@ -27,9 +25,6 @@ const copyToClipBoardMiddleware = require('./middleware/copyToClipBoardMiddlewar
 const defaultAssetExts = Metro.defaults.assetExts;
 const defaultSourceExts = Metro.defaults.sourceExts;
 const defaultPlatforms = Metro.defaults.platforms;
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const defaultProvidesModuleNodeModules =
   Metro.defaults.providesModuleNodeModules;
 const errorhandler = require('errorhandler');
@@ -48,17 +43,14 @@ const statusPageMiddleware = require('./middleware/statusPageMiddleware.js');
 const systraceProfileMiddleware = require('./middleware/systraceProfileMiddleware.js');
 const webSocketProxy = require('./util/webSocketProxy.js');
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
+/* $FlowFixMe(site=react_native_oss) */
 const TransformCaching = require('metro/src/lib/TransformCaching');
 
 const {ASSET_REGISTRY_PATH} = require('../core/Constants');
 
+/* $FlowFixMe(site=react_native_oss) */
 import type {ConfigT} from 'metro';
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
+/* $FlowFixMe(site=react_native_oss) */
 import type {Reporter} from 'metro/src/lib/reporting';
 
 export type Args = {|
@@ -176,6 +168,7 @@ function getPackagerServer(args, config, reporter) {
     assetExts: defaultAssetExts.concat(args.assetExts),
     assetRegistryPath: ASSET_REGISTRY_PATH,
     blacklistRE: config.getBlacklistRE(),
+    cacheStores: config.cacheStores,
     cacheVersion: '3',
     enableBabelRCLookup: config.getEnableBabelRCLookup(),
     extraNodeModules: config.extraNodeModules,
@@ -195,7 +188,7 @@ function getPackagerServer(args, config, reporter) {
     providesModuleNodeModules: providesModuleNodeModules,
     reporter,
     resetCache: args.resetCache,
-    sourceExts: defaultSourceExts.concat(args.sourceExts),
+    sourceExts: args.sourceExts.concat(defaultSourceExts),
     transformModulePath: transformModulePath,
     transformCache: TransformCaching.useTempDir(),
     verbose: args.verbose,
diff --git a/local-cli/server/server.js b/local-cli/server/server.js
index df4fd22a2c7f85..f188a3e82dd48d 100644
--- a/local-cli/server/server.js
+++ b/local-cli/server/server.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/server/util/attachWebsocketServer.js b/local-cli/server/util/attachWebsocketServer.js
index fcbe0f7198da97..66f8fe953a4ad0 100644
--- a/local-cli/server/util/attachWebsocketServer.js
+++ b/local-cli/server/util/attachWebsocketServer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @flow
diff --git a/local-cli/server/util/copyToClipBoard.js b/local-cli/server/util/copyToClipBoard.js
index e0113ce5a413bd..bb2259e8150389 100644
--- a/local-cli/server/util/copyToClipBoard.js
+++ b/local-cli/server/util/copyToClipBoard.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/util/debugger-ui/DeltaPatcher.js b/local-cli/server/util/debugger-ui/DeltaPatcher.js
index 1787307b99a396..ecc92dce7b0ec1 100644
--- a/local-cli/server/util/debugger-ui/DeltaPatcher.js
+++ b/local-cli/server/util/debugger-ui/DeltaPatcher.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  */
@@ -32,6 +30,7 @@
         pre: new Map(),
         post: new Map(),
         modules: new Map(),
+        id: undefined,
       };
       this._initialized = false;
       this._lastNumModifiedFiles = 0;
@@ -68,6 +67,7 @@
           pre: new Map(),
           post: new Map(),
           modules: new Map(),
+          id: undefined,
         };
       }
 
@@ -82,9 +82,15 @@
       this._patchMap(this._lastBundle.post, deltaBundle.post);
       this._patchMap(this._lastBundle.modules, deltaBundle.delta);
 
+      this._lastBundle.id = deltaBundle.id;
+
       return this;
     }
 
+    getLastBundleId() {
+      return this._lastBundle.id;
+    }
+
     /**
      * Returns the number of modified files in the last received Delta. This is
      * currently used to populate the `X-Metro-Files-Changed-Count` HTTP header
diff --git a/local-cli/server/util/debugger-ui/debuggerWorker.js b/local-cli/server/util/debugger-ui/debuggerWorker.js
index c05f558d87962b..e70ca0ec973547 100644
--- a/local-cli/server/util/debugger-ui/debuggerWorker.js
+++ b/local-cli/server/util/debugger-ui/debuggerWorker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /* global __fbBatchedBridge, self, importScripts, postMessage, onmessage: true */
diff --git a/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js b/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
index 5a206ce2281809..d611062952aa22 100644
--- a/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
+++ b/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
@@ -22,31 +20,34 @@
    * whole JS bundle Blob.
    */
   async function deltaUrlToBlobUrl(deltaUrl) {
-    let cachedBundle = cachedBundleUrls.get(deltaUrl);
+    const client = global.DeltaPatcher.get(deltaUrl);
 
-    const deltaBundleId = cachedBundle
-      ? `&deltaBundleId=${cachedBundle.id}`
+    const deltaBundleId = client.getLastBundleId()
+      ? `&deltaBundleId=${client.getLastBundleId()}`
       : '';
 
     const data = await fetch(deltaUrl + deltaBundleId);
     const bundle = await data.json();
 
-    const deltaPatcher = global.DeltaPatcher.get(bundle.id).applyDelta({
+    const deltaPatcher = client.applyDelta({
+      id: bundle.id,
       pre: new Map(bundle.pre),
       post: new Map(bundle.post),
       delta: new Map(bundle.delta),
       reset: bundle.reset,
     });
 
+    let cachedBundle = cachedBundleUrls.get(deltaUrl);
+
     // If nothing changed, avoid recreating a bundle blob by reusing the
     // previous one.
     if (deltaPatcher.getLastNumModifiedFiles() === 0 && cachedBundle) {
-      return cachedBundle.url;
+      return cachedBundle;
     }
 
     // Clean up the previous bundle URL to not leak memory.
     if (cachedBundle) {
-      URL.revokeObjectURL(cachedBundle.url);
+      URL.revokeObjectURL(cachedBundle);
     }
 
     // To make Source Maps work correctly, we need to add a newline between
@@ -60,13 +61,10 @@
       type: 'application/javascript',
     });
 
-    const bundleUrl = URL.createObjectURL(blob);
-    cachedBundleUrls.set(deltaUrl, {
-      id: bundle.id,
-      url: bundleUrl,
-    });
+    const bundleContents = URL.createObjectURL(blob);
+    cachedBundleUrls.set(deltaUrl, bundleContents);
 
-    return bundleUrl;
+    return bundleContents;
   }
 
   global.deltaUrlToBlobUrl = deltaUrlToBlobUrl;
diff --git a/local-cli/server/util/debugger-ui/index.html b/local-cli/server/util/debugger-ui/index.html
index c21a21892ba313..57d377629abd79 100644
--- a/local-cli/server/util/debugger-ui/index.html
+++ b/local-cli/server/util/debugger-ui/index.html
@@ -1,11 +1,9 @@
 <!DOCTYPE html>
 <!--
   Copyright (c) 2015-present, Facebook, Inc.
-  All rights reserved.
-
-  This source code is licensed under the BSD-style license found in the
-  LICENSE file in the root directory of this source tree. An additional grant
-  of patent rights can be found in the PATENTS file in the same directory.
+  
+  This source code is licensed under the MIT license found in the
+  LICENSE file in the root directory of this source tree.
 -->
 <html>
 <head>
diff --git a/local-cli/server/util/jsPackagerClient.js b/local-cli/server/util/jsPackagerClient.js
index 582e74416a29e6..3b449db160e404 100644
--- a/local-cli/server/util/jsPackagerClient.js
+++ b/local-cli/server/util/jsPackagerClient.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/local-cli/server/util/launchChrome.js b/local-cli/server/util/launchChrome.js
index 8dd1900a8f3610..6999a3d0bdd0bd 100644
--- a/local-cli/server/util/launchChrome.js
+++ b/local-cli/server/util/launchChrome.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/server/util/launchEditor.js b/local-cli/server/util/launchEditor.js
index 3ea5e9621a71c5..f78927d82d6e47 100644
--- a/local-cli/server/util/launchEditor.js
+++ b/local-cli/server/util/launchEditor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/util/messageSocket.js b/local-cli/server/util/messageSocket.js
index d8b0236dd78036..bceb72fab01c5d 100644
--- a/local-cli/server/util/messageSocket.js
+++ b/local-cli/server/util/messageSocket.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/util/webSocketProxy.js b/local-cli/server/util/webSocketProxy.js
index f862c34bf8bd60..2a854c6d81d571 100644
--- a/local-cli/server/util/webSocketProxy.js
+++ b/local-cli/server/util/webSocketProxy.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/setup_env.bat b/local-cli/setup_env.bat
index 9cd1e826648fc9..e5c135e5abff82 100755
--- a/local-cli/setup_env.bat
+++ b/local-cli/setup_env.bat
@@ -1,6 +1,4 @@
 :: Copyright (c) 2015-present, Facebook, Inc.
-:: All rights reserved.
 ::
-:: This source code is licensed under the BSD-style license found in the
-:: LICENSE file in the root directory of this source tree. An additional grant
-:: of patent rights can be found in the PATENTS file in the same directory.
+:: This source code is licensed under the MIT license found in the
+:: LICENSE file in the root directory of this source tree.
diff --git a/local-cli/setup_env.sh b/local-cli/setup_env.sh
index 87a722b5c154e5..0087df50c04aa4 100755
--- a/local-cli/setup_env.sh
+++ b/local-cli/setup_env.sh
@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 # Copyright (c) 2015-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # 2048 is the max for non root users on Mac
 ulimit -n 2048
diff --git a/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js b/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js
index f38567ea3ae206..72e10391757c57 100644
--- a/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js
+++ b/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/templates/HelloWorld/_flowconfig b/local-cli/templates/HelloWorld/_flowconfig
index 10cb8d509a45a8..7d5e2d3362ba40 100644
--- a/local-cli/templates/HelloWorld/_flowconfig
+++ b/local-cli/templates/HelloWorld/_flowconfig
@@ -51,4 +51,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.65.0
+^0.67.0
diff --git a/local-cli/templates/HelloWorld/_gitignore b/local-cli/templates/HelloWorld/_gitignore
index 0826423b786cca..5d647565fa9ef7 100644
--- a/local-cli/templates/HelloWorld/_gitignore
+++ b/local-cli/templates/HelloWorld/_gitignore
@@ -51,3 +51,6 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
+
+# Bundle artifact
+*.jsbundle
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
index a7c51152b93bbf..d004c9c3a14d80 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
@@ -34,6 +34,7 @@
 		2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */; };
 		2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
 		2DCD954D1E0B4F2C00145EB5 /* HelloWorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* HelloWorldTests.m */; };
+		2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
 		5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
@@ -131,6 +132,62 @@
 			remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
 			remoteInfo = "fishhook-tvOS";
 		};
+		2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EBF21BDC1FC498900052F4D5;
+			remoteInfo = jsinspector;
+		};
+		2DF0FFE02056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5;
+			remoteInfo = "jsinspector-tvOS";
+		};
+		2DF0FFE22056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
+			remoteInfo = "third-party";
+		};
+		2DF0FFE42056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D383D3C1EBD27B6005632C8;
+			remoteInfo = "third-party-tvOS";
+		};
+		2DF0FFE62056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 139D7E881E25C6D100323FB7;
+			remoteInfo = "double-conversion";
+		};
+		2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D383D621EBD27B9005632C8;
+			remoteInfo = "double-conversion-tvOS";
+		};
+		2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
+			remoteInfo = privatedata;
+		};
+		2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
+			remoteInfo = "privatedata-tvOS";
+		};
 		3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@@ -336,6 +393,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -439,13 +497,21 @@
 			isa = PBXGroup;
 			children = (
 				146834041AC3E56700842450 /* libReact.a */,
+				3DAD3EA31DF850E9000B6D8A /* libReact.a */,
 				3DAD3EA51DF850E9000B6D8A /* libyoga.a */,
 				3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
 				3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
 				3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
 				3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
 				3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
-				3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */,
+				2DF0FFDF2056DD460020B375 /* libjsinspector.a */,
+				2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */,
+				2DF0FFE32056DD460020B375 /* libthird-party.a */,
+				2DF0FFE52056DD460020B375 /* libthird-party.a */,
+				2DF0FFE72056DD460020B375 /* libdouble-conversion.a */,
+				2DF0FFE92056DD460020B375 /* libdouble-conversion.a */,
+				2DF0FFEB2056DD460020B375 /* libprivatedata.a */,
+				2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -786,6 +852,62 @@
 			remoteRef = 2D16E6851FA4F8DC00B85C8A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		2DF0FFDF2056DD460020B375 /* libjsinspector.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjsinspector.a;
+			remoteRef = 2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libjsinspector-tvOS.a";
+			remoteRef = 2DF0FFE02056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFE32056DD460020B375 /* libthird-party.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libthird-party.a";
+			remoteRef = 2DF0FFE22056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFE52056DD460020B375 /* libthird-party.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libthird-party.a";
+			remoteRef = 2DF0FFE42056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFE72056DD460020B375 /* libdouble-conversion.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libdouble-conversion.a";
+			remoteRef = 2DF0FFE62056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFE92056DD460020B375 /* libdouble-conversion.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libdouble-conversion.a";
+			remoteRef = 2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFEB2056DD460020B375 /* libprivatedata.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libprivatedata.a;
+			remoteRef = 2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libprivatedata-tvOS.a";
+			remoteRef = 2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -828,10 +950,10 @@
 			remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */ = {
+		3DAD3EA31DF850E9000B6D8A /* libReact.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libReact-tvOS.a";
+			path = libReact.a;
 			remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -1179,6 +1301,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "HelloWorld-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lc++",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.HelloWorld-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
@@ -1200,6 +1326,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "HelloWorld-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lc++",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.HelloWorld-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h
index a9654d5e01b18c..d4f2580b1ea1b8 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m
index 7807738016e386..23a3b137c46c99 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "AppDelegate.h"
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/main.m b/local-cli/templates/HelloWorld/ios/HelloWorld/main.m
index 3d767fcbb9fced..c73e006253a31d 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld/main.m
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld/main.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m b/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
index 161aba80468287..45fba113383af7 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
+++ b/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/local-cli/upgrade/upgrade.js b/local-cli/upgrade/upgrade.js
index 2feb3f3149271b..93e3a7815d1f6a 100644
--- a/local-cli/upgrade/upgrade.js
+++ b/local-cli/upgrade/upgrade.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/Config.js b/local-cli/util/Config.js
index 132ef3e286ec67..9fc4487fe83ee8 100644
--- a/local-cli/util/Config.js
+++ b/local-cli/util/Config.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @flow
@@ -17,7 +15,7 @@ const getPolyfills = require('../../rn-get-polyfills');
 const invariant = require('fbjs/lib/invariant');
 const path = require('path');
 
-const {Config: MetroConfig} = require('metro');
+const {Config: MetroConfig, createBlacklist} = require('metro');
 
 const RN_CLI_CONFIG = 'rn-cli.config.js';
 
@@ -56,6 +54,10 @@ const getProjectRoots = () => {
   return resolveSymlinksForRoots([getProjectPath()]);
 };
 
+const getBlacklistRE = () => {
+  return createBlacklist([/.*\/__fixtures__\/.*/]);
+};
+
 /**
  * Module capable of getting the configuration out of a given file.
  *
@@ -67,6 +69,7 @@ const getProjectRoots = () => {
 const Config = {
   DEFAULT: ({
     ...MetroConfig.DEFAULT,
+    getBlacklistRE,
     getProjectRoots,
     getPolyfills,
     getModulesRunBeforeMainModule: () => [
diff --git a/local-cli/util/PackageManager.js b/local-cli/util/PackageManager.js
index 6d866a0505aa23..89024ff2712baf 100644
--- a/local-cli/util/PackageManager.js
+++ b/local-cli/util/PackageManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/__mocks__/log.js b/local-cli/util/__mocks__/log.js
index 5fff767d2e025a..742b2c03701e49 100644
--- a/local-cli/util/__mocks__/log.js
+++ b/local-cli/util/__mocks__/log.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/__tests__/findSymlinkedModules-test.js b/local-cli/util/__tests__/findSymlinkedModules-test.js
index 8a1900453aa27a..25c1b52d27ad99 100644
--- a/local-cli/util/__tests__/findSymlinkedModules-test.js
+++ b/local-cli/util/__tests__/findSymlinkedModules-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/util/assertRequiredOptions.js b/local-cli/util/assertRequiredOptions.js
index 28bbc9b34e2ce2..877caf0583b9c7 100644
--- a/local-cli/util/assertRequiredOptions.js
+++ b/local-cli/util/assertRequiredOptions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/copyAndReplace.js b/local-cli/util/copyAndReplace.js
index c48c80b8e9a25f..543bc6ecf012ee 100644
--- a/local-cli/util/copyAndReplace.js
+++ b/local-cli/util/copyAndReplace.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/findReactNativeScripts.js b/local-cli/util/findReactNativeScripts.js
index a66bb110d90e1a..28317cd60f2f9d 100644
--- a/local-cli/util/findReactNativeScripts.js
+++ b/local-cli/util/findReactNativeScripts.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/util/findSymlinkedModules.js b/local-cli/util/findSymlinkedModules.js
index 64191b585864f5..428ed3ead05607 100644
--- a/local-cli/util/findSymlinkedModules.js
+++ b/local-cli/util/findSymlinkedModules.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @flow
diff --git a/local-cli/util/findSymlinksPaths.js b/local-cli/util/findSymlinksPaths.js
index 61edda340ed368..e9d2d5670bfd26 100644
--- a/local-cli/util/findSymlinksPaths.js
+++ b/local-cli/util/findSymlinksPaths.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const path = require('path');
diff --git a/local-cli/util/isPackagerRunning.js b/local-cli/util/isPackagerRunning.js
index fbdebd08d255f9..1384e6be953544 100644
--- a/local-cli/util/isPackagerRunning.js
+++ b/local-cli/util/isPackagerRunning.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/isValidPackageName.js b/local-cli/util/isValidPackageName.js
index 89be87fbee78fb..6bf1fdf91671d0 100644
--- a/local-cli/util/isValidPackageName.js
+++ b/local-cli/util/isValidPackageName.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/log.js b/local-cli/util/log.js
index 16bbbae58e7a64..6215de5e76e86d 100644
--- a/local-cli/util/log.js
+++ b/local-cli/util/log.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/parseCommandLine.js b/local-cli/util/parseCommandLine.js
index 10b8d3537aaf5b..d216959d68c9ab 100644
--- a/local-cli/util/parseCommandLine.js
+++ b/local-cli/util/parseCommandLine.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * Wrapper on-top of `optimist` in order to properly support boolean flags
  * and have a slightly less awkward API.
diff --git a/local-cli/util/walk.js b/local-cli/util/walk.js
index fae2fc2000b322..5ca1c8d52f32d3 100644
--- a/local-cli/util/walk.js
+++ b/local-cli/util/walk.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/yarn.js b/local-cli/util/yarn.js
index 8bef7804eb9b09..f2edb1c382df3c 100644
--- a/local-cli/util/yarn.js
+++ b/local-cli/util/yarn.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/wrong-react-native.js b/local-cli/wrong-react-native.js
index 2555fa04546983..57f04feadc39d4 100755
--- a/local-cli/wrong-react-native.js
+++ b/local-cli/wrong-react-native.js
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const isWindows = process.platform === 'win32';
diff --git a/package.json b/package.json
index 92be465f9c5c5c..bd1562054a5852 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "react-native",
-  "version": "1000.0.0",
+  "version": "0.55.4",
   "description": "A framework for building native apps using React",
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git@github.com:facebook/react-native.git"
@@ -112,7 +112,6 @@
     "LICENSE",
     "local-cli",
     "packager",
-    "PATENTS",
     "react.gradle",
     "React.podspec",
     "React",
@@ -143,7 +142,7 @@
     "react-native": "local-cli/wrong-react-native.js"
   },
   "peerDependencies": {
-    "react": "^16.3.0-alpha.0"
+    "react": "16.3.1"
   },
   "dependencies": {
     "absolute-path": "^0.0.0",
@@ -167,6 +166,7 @@
     "denodeify": "^1.2.1",
     "envinfo": "^3.0.0",
     "errorhandler": "^1.5.0",
+    "eslint-plugin-react-native": "^3.2.1",
     "event-target-shim": "^1.0.5",
     "fbjs": "^0.8.14",
     "fbjs-scripts": "^0.8.1",
@@ -175,14 +175,14 @@
     "graceful-fs": "^4.1.3",
     "inquirer": "^3.0.6",
     "lodash": "^4.17.5",
-    "metro": "^0.25.1",
-    "metro-core": "^0.25.1",
+    "metro": "^0.30.0",
+    "metro-core": "^0.30.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "morgan": "^1.9.0",
     "node-fetch": "^1.3.3",
-    "node-notifier": "^5.1.2",
+    "node-notifier": "^5.2.1",
     "npmlog": "^2.0.4",
     "opn": "^3.0.2",
     "optimist": "^0.6.1",
@@ -215,13 +215,13 @@
     "eslint-plugin-jest": "21.8.0",
     "eslint-plugin-prettier": "2.6.0",
     "eslint-plugin-react": "7.6.1",
-    "flow-bin": "^0.65.0",
-    "jest": "22.2.1",
-    "jest-junit": "3.5.0",
+    "flow-bin": "^0.67.1",
+    "jest": "22.4.2",
+    "jest-junit": "3.6.0",
     "prettier": "1.9.1",
-    "react": "^16.3.0-alpha.0",
-    "react-test-renderer": "^16.3.0-alpha.0",
+    "react": "16.3.1",
+    "react-test-renderer": "16.3.1",
     "shelljs": "^0.7.8",
     "sinon": "^2.2.0"
   }
-}
+}
\ No newline at end of file
diff --git a/react-native-cli/index.js b/react-native-cli/index.js
index 4de761a7ff4653..5cde164967a715 100755
--- a/react-native-cli/index.js
+++ b/react-native-cli/index.js
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/react-native-cli/package.json b/react-native-cli/package.json
index 1d7498c49a6757..fb966fa17c4b34 100644
--- a/react-native-cli/package.json
+++ b/react-native-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-native-cli",
   "version": "2.0.1",
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "description": "The React Native CLI tools",
   "main": "index.js",
   "engines": {
diff --git a/react-native-git-upgrade/checks.js b/react-native-git-upgrade/checks.js
index 3be8f7b7a0cdfc..1660addd00e2b8 100644
--- a/react-native-git-upgrade/checks.js
+++ b/react-native-git-upgrade/checks.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/react-native-git-upgrade/cli.js b/react-native-git-upgrade/cli.js
index f664d9583e5c7c..94647fd16c48da 100644
--- a/react-native-git-upgrade/cli.js
+++ b/react-native-git-upgrade/cli.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/react-native-git-upgrade/cliEntry.js b/react-native-git-upgrade/cliEntry.js
index 1bb36cc63d5224..a9cbfa5641f369 100644
--- a/react-native-git-upgrade/cliEntry.js
+++ b/react-native-git-upgrade/cliEntry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
@@ -33,9 +31,10 @@ log.heading = 'git-upgrade';
 /**
  * Promisify the callback-based shelljs function exec
  * @param logOutput If true, log the stdout of the command.
+ * @param logger Custom logger to modify the output, invoked with the data and the stream.
  * @returns {Promise}
  */
-function exec(command, logOutput) {
+function exec(command, logOutput, logger = null) {
   return new Promise((resolve, reject) => {
     let stderr, stdout = '';
     const child = shell.exec(command, {async: true, silent: true});
@@ -43,13 +42,21 @@ function exec(command, logOutput) {
     child.stdout.on('data', data => {
       stdout += data;
       if (logOutput) {
-        process.stdout.write(data);
+        if (logger) {
+          logger(data, process.stdout);
+        } else {
+          process.stdout.write(data);
+        }
       }
     });
 
     child.stderr.on('data', data => {
       stderr += data;
-      process.stderr.write(data);
+      if (logger) {
+        logger(data, process.stderr);
+      } else {
+        process.stderr.write(data);
+      }
     });
 
     child.on('exit', (code, signal) => {
@@ -359,7 +366,13 @@ async function run(requestedVersion, cliArgs) {
 
     try {
       log.info('Apply the patch');
-      await exec(`git apply --3way ${patchPath}`, true);
+      await exec(`git apply --3way ${patchPath}`, true, (data, stream) => {
+        if (data.indexOf('conflicts') >= 0 || data.startsWith('U ')) {
+          stream.write(`\x1b[31m${data}\x1b[0m`);
+        } else {
+          stream.write(data);
+        }
+      });
     } catch (err) {
       log.warn(
         'The upgrade process succeeded but there might be conflicts to be resolved. ' +
diff --git a/react-native-git-upgrade/index.js b/react-native-git-upgrade/index.js
index c676a7a65ee93b..dea50c344e9ab8 100644
--- a/react-native-git-upgrade/index.js
+++ b/react-native-git-upgrade/index.js
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 var argv = require('minimist')(process.argv.slice(2));
diff --git a/react-native-git-upgrade/package.json b/react-native-git-upgrade/package.json
index 9556cc277a082a..21cfa896188626 100644
--- a/react-native-git-upgrade/package.json
+++ b/react-native-git-upgrade/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-native-git-upgrade",
   "version": "0.2.7",
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "description": "The React Native upgrade tool",
   "main": "cli.js",
   "bin": {
diff --git a/react-native-git-upgrade/yarn.js b/react-native-git-upgrade/yarn.js
index 7dda2501dc64e7..9e461190e458cd 100644
--- a/react-native-git-upgrade/yarn.js
+++ b/react-native-git-upgrade/yarn.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/react.gradle b/react.gradle
index 64b2f02f8cbf26..c08bdaa3e3f040 100644
--- a/react.gradle
+++ b/react.gradle
@@ -70,6 +70,22 @@ gradle.projectsEvaluated {
                     resourcesDir.mkdirs()
                 }
 
+                doLast {
+                    def moveFunc = { resSuffix ->
+                        File originalDir = file("${resourcesDir}/drawable-${resSuffix}")
+                        if (originalDir.exists()) {
+                            File destDir = file("${resourcesDir}/drawable-${resSuffix}-v4")
+                            ant.move(file: originalDir, tofile: destDir)
+                        }
+                    }
+                    moveFunc.curry("ldpi").call()
+                    moveFunc.curry("mdpi").call()
+                    moveFunc.curry("hdpi").call()
+                    moveFunc.curry("xhdpi").call()
+                    moveFunc.curry("xxhdpi").call()
+                    moveFunc.curry("xxxhdpi").call()
+                }
+
                 // Set up inputs and outputs so gradle can cache the result
                 inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
                 outputs.dir jsBundleDir
@@ -115,3 +131,4 @@ gradle.projectsEvaluated {
         }
     }
 }
+
diff --git a/rn-cli.config.js b/rn-cli.config.js
index 2f6f5f2031f74d..694fd8d6399ee6 100644
--- a/rn-cli.config.js
+++ b/rn-cli.config.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/rn-get-polyfills.js b/rn-get-polyfills.js
index a228d6f1f91875..e7dd869c6f4ef6 100644
--- a/rn-get-polyfills.js
+++ b/rn-get-polyfills.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/scripts/.packager.env b/scripts/.packager.env
new file mode 100644
index 00000000000000..361f5fb47d34ac
--- /dev/null
+++ b/scripts/.packager.env
@@ -0,0 +1 @@
+export RCT_METRO_PORT=8081
diff --git a/scripts/android-e2e-test.js b/scripts/android-e2e-test.js
index 1feda1e4fe35a1..bb0e109607defd 100644
--- a/scripts/android-e2e-test.js
+++ b/scripts/android-e2e-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * Used in run-ci-e2e-test.js and executed in Circle CI.
  * E2e test that verifies that init app can be installed, compiled, started and Hot Module reloading and Chrome debugging work.
diff --git a/scripts/bump-oss-version.js b/scripts/bump-oss-version.js
index b8fe500a621383..11ac0f940e0f95 100755
--- a/scripts/bump-oss-version.js
+++ b/scripts/bump-oss-version.js
@@ -1,11 +1,9 @@
 #!/usr/bin/env node
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
@@ -69,8 +67,8 @@ fs.writeFileSync(
 );
 
 fs.writeFileSync(
-  'React/Base/RCTVersion.h',
-  cat('scripts/versiontemplates/RCTVersion.h.template')
+  'React/Base/RCTVersion.m',
+  cat('scripts/versiontemplates/RCTVersion.m.template')
     .replace('${major}', `@(${major})`)
     .replace('${minor}', `@(${minor})`)
     .replace('${patch}', `@(${patch})`)
diff --git a/scripts/circleci/check_cache.sh b/scripts/circleci/check_cache.sh
new file mode 100755
index 00000000000000..5cd3b68251eef1
--- /dev/null
+++ b/scripts/circleci/check_cache.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+# Make sure we don't accidentally restore a cache that contains the Metro
+# filename issue that was fixed in Metro 0.25, originally introduced in
+# D6752278. Once fixed, this was causing sporadic failures in the iOS
+# and tvOS workflows as the issue persisted in the cached node_modules
+#
+# The filename issue can be summarized as follows:
+# A version of Metro was published to npm with HmrClient.js and
+# HmrClient.js.flow files, while the repo contains HMRClient.js and
+# HMRClient.js.flow. This was due to a case issue in the publisher's
+# host machine.
+# The issue this is checking for is manifested by the presence of all
+# of the following files: HmrClient.js, HMRClient.js, HmrClient.js.flow,
+# HMRClient.js.flow.
+
+EXPECTED='1'
+ACTUAL=$(ls node_modules/metro/src/lib/bundle-modules/*.js | xargs | awk '{print tolower($0)}' | tr ' ' '\n' | grep hmrclient.js | wc -l | tr -d '[:space:]')
+
+if [ "$EXPECTED" != "$ACTUAL" ]; then
+  echo "HmrClient.js crept into the cache?"
+  echo $(ls node_modules/metro/src/lib/bundle-modules/H*lient.js)
+  exit 1
+fi
diff --git a/scripts/circleci/check_license.sh b/scripts/circleci/check_license.sh
new file mode 100755
index 00000000000000..68b41d6ac441b6
--- /dev/null
+++ b/scripts/circleci/check_license.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Make sure we don't introduce accidental references to PATENTS.
+EXPECTED='scripts/circleci/check_license.sh'
+ACTUAL=$(git grep -l PATENTS)
+
+if [ "$EXPECTED" != "$ACTUAL" ]; then
+  echo "PATENTS crept into some new files?"
+  diff -u <(echo "$EXPECTED") <(echo "$ACTUAL") || true
+  exit 1
+fi
diff --git a/scripts/launchPackager.bat b/scripts/launchPackager.bat
index 00ac056a362b83..09f1de98737002 100644
--- a/scripts/launchPackager.bat
+++ b/scripts/launchPackager.bat
@@ -1,9 +1,7 @@
 :: Copyright (c) 2015-present, Facebook, Inc.
-:: All rights reserved.
 ::
-:: This source code is licensed under the BSD-style license found in the
-:: LICENSE file in the root directory of this source tree. An additional grant
-:: of patent rights can be found in the PATENTS file in the same directory.
+:: This source code is licensed under the MIT license found in the
+:: LICENSE file in the root directory of this source tree.
 
 @echo off
 title Metro Bundler
diff --git a/scripts/launchPackager.command b/scripts/launchPackager.command
index 20bbf8e06f9a21..b4570cd3c63027 100755
--- a/scripts/launchPackager.command
+++ b/scripts/launchPackager.command
@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 
 # Copyright (c) 2015-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # Set terminal title
 echo -en "\033]0;Metro Bundler\a"
diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh
index 81614c5f6edffc..f2c0459989daaa 100755
--- a/scripts/objc-test.sh
+++ b/scripts/objc-test.sh
@@ -73,9 +73,6 @@ curl 'http://localhost:8081/IntegrationTests/RCTRootViewIntegrationTestApp.bundl
 rm temp.bundle
 
 # Run tests
-# TODO: We use xcodebuild because xctool would stall when collecting info about
-# the tests before running them. Switch back when this issue with xctool has
-# been resolved.
 xcodebuild \
   -project "RNTester/RNTester.xcodeproj" \
   -scheme $SCHEME \
@@ -87,9 +84,6 @@ xcodebuild \
 else
 
 # Don't run tests. No need to pass -destination to xcodebuild.
-# TODO: We use xcodebuild because xctool would stall when collecting info about
-# the tests before running them. Switch back when this issue with xctool has
-# been resolved.
 xcodebuild \
   -project "RNTester/RNTester.xcodeproj" \
   -scheme $SCHEME \
diff --git a/scripts/packager.sh b/scripts/packager.sh
index f7ce245a42403d..ee3966923a2bb0 100755
--- a/scripts/packager.sh
+++ b/scripts/packager.sh
@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 
 # Copyright (c) 2015-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 THIS_DIR=$(dirname "$0")
 source "${THIS_DIR}/.packager.env"
diff --git a/scripts/publish-npm.js b/scripts/publish-npm.js
index 96e37318108a64..269fc7014dd3ff 100644
--- a/scripts/publish-npm.js
+++ b/scripts/publish-npm.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/scripts/react-native-xcode.sh b/scripts/react-native-xcode.sh
index 04a309f38bdf92..1e259741276241 100755
--- a/scripts/react-native-xcode.sh
+++ b/scripts/react-native-xcode.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 # Copyright (c) 2015-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # Bundle React Native app's code and image assets.
 # This script is supposed to be invoked as part of Xcode build process
diff --git a/scripts/run-android-ci-instrumentation-tests.js b/scripts/run-android-ci-instrumentation-tests.js
index 9cf72b9763aa5e..17d382a32e1525 100644
--- a/scripts/run-android-ci-instrumentation-tests.js
+++ b/scripts/run-android-ci-instrumentation-tests.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/scripts/run-ci-e2e-tests.js b/scripts/run-ci-e2e-tests.js
index 5c38ae676c3a06..cd1163f0ba2443 100644
--- a/scripts/run-ci-e2e-tests.js
+++ b/scripts/run-ci-e2e-tests.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/scripts/sync-css-layout.sh b/scripts/sync-css-layout.sh
index fcd5bb525a0090..6c2f2f3c01f2a4 100755
--- a/scripts/sync-css-layout.sh
+++ b/scripts/sync-css-layout.sh
@@ -8,10 +8,9 @@ function patchfile {
   # Add React Native copyright
   printf "/**\n"  > /tmp/yogasync.tmp
   printf " * Copyright (c) 2014-present, Facebook, Inc.\n"  >> /tmp/yogasync.tmp
-  printf " * All rights reserved.\n" >> /tmp/yogasync.tmp
-  printf " * This source code is licensed under the BSD-style license found in the\n"  >> /tmp/yogasync.tmp
-  printf " * LICENSE file in the root directory of this source tree. An additional grant\n"  >> /tmp/yogasync.tmp
-  printf " * of patent rights can be found in the PATENTS file in the same directory.\n"  >> /tmp/yogasync.tmp
+  printf " *\n" >> /tmp/yogasync.tmp
+  printf " * This source code is licensed under the MIT license found in the\n"  >> /tmp/yogasync.tmp
+  printf " * LICENSE file in the root directory of this source tree.\n"  >> /tmp/yogasync.tmp
   printf " */\n\n"  >> /tmp/yogasync.tmp
   printf "// NOTE: this file is auto-copied from https://github.com/facebook/css-layout\n" >> /tmp/yogasync.tmp
   # The following is split over four lines so Phabricator doesn't think this file is generated
diff --git a/scripts/try-n-times.js b/scripts/try-n-times.js
index 66cfb71a139b7e..51cba900c22b72 100644
--- a/scripts/try-n-times.js
+++ b/scripts/try-n-times.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /* globals echo:false */
diff --git a/scripts/validate-android-test-env.sh b/scripts/validate-android-test-env.sh
index 8b428e76fc4bdf..7ec0b668c84d00 100755
--- a/scripts/validate-android-test-env.sh
+++ b/scripts/validate-android-test-env.sh
@@ -18,14 +18,14 @@ if [ -z "$(buck --version)" ]; then
   echo "Your Buck install is broken."
 
   if [ -d "/opt/facebook" ]; then
-    SUGGESTED="b9b76a3a5a086eb440a26d1db9b0731875975099"
+    BUCK_SUGGESTED_COMMIT_FB="b9b76a3a5a086eb440a26d1db9b0731875975099"
     echo "FB laptops ship with a Buck config that is not compatible with open "
     echo "source. FB Buck requires the environment to set a buck version, but "
     echo "the open source version of Buck forbids that."
     echo
     echo "You can try setting:"
     echo
-    echo "export BUCKVERSION=${SUGGESTED}"
+    echo "export BUCKVERSION=${BUCK_SUGGESTED_COMMIT_FB}"
     echo
     echo "in your .bashrc or .bash_profile to fix this."
     echo
@@ -33,12 +33,19 @@ if [ -z "$(buck --version)" ]; then
     echo "your machine, you can just scope it to a single script, for example"
     echo "by running something like:"
     echo
-    echo "BUCKVERSION=${SUGGESTED} $0"
+    echo "BUCKVERSION=${BUCK_SUGGESTED_COMMIT_FB} $0"
     echo
   else
     echo "I don't know what's wrong, but calling 'buck --version' should work."
   fi
   exit 1
+else
+  BUCK_EXPECTED_VERSION="buck version d743d2d0229852ce7c029ec257532d8916f6b2b7"
+  if [ "$(buck --version)" != "$BUCK_EXPECTED_VERSION" ]; then
+    if [ ! -d "/opt/facebook" ]; then
+      echo "Warning: The test suite expects ${BUCK_EXPECTED_VERSION} to be installed"
+    fi
+  fi
 fi
 
 # BUILD_TOOLS_VERSION is in a format like "23.0.1"
diff --git a/scripts/versiontemplates/RCTVersion.h.template b/scripts/versiontemplates/RCTVersion.h.template
deleted file mode 100644
index f188ae8a2ba71d..00000000000000
--- a/scripts/versiontemplates/RCTVersion.h.template
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @generated by scripts/bump-oss-version.js
- *
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#define RCT_REACT_NATIVE_VERSION @{ \
-  @"major": ${major}, \
-  @"minor": ${minor}, \
-  @"patch": ${patch}, \
-  @"prerelease": ${prerelease}, \
-}
diff --git a/scripts/versiontemplates/RCTVersion.m.template b/scripts/versiontemplates/RCTVersion.m.template
new file mode 100644
index 00000000000000..a550fb3216014d
--- /dev/null
+++ b/scripts/versiontemplates/RCTVersion.m.template
@@ -0,0 +1,33 @@
+/**
+ * @generated by scripts/bump-oss-version.js
+ *
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTVersion.h"
+
+NSString* const RCTVersionMajor = @"major";
+NSString* const RCTVersionMinor = @"minor";
+NSString* const RCTVersionPatch = @"patch";
+NSString* const RCTVersionPrerelease = @"prerelease";
+
+static NSDictionary* __rnVersion;
+
+__attribute__((constructor))
+static void __makeVersion()
+{
+  __rnVersion = @{
+                  RCTVersionMajor: ${major},
+                  RCTVersionMinor: ${minor},
+                  RCTVersionPatch: ${patch},
+                  RCTVersionPrerelease: ${prerelease},
+                  };
+}
+
+NSDictionary* RCTGetReactNativeVersion(void)
+{
+  return __rnVersion;
+}
diff --git a/scripts/versiontemplates/ReactNativeVersion.java.template b/scripts/versiontemplates/ReactNativeVersion.java.template
index 7ae1cecc8b120d..12d55c3db4df0f 100644
--- a/scripts/versiontemplates/ReactNativeVersion.java.template
+++ b/scripts/versiontemplates/ReactNativeVersion.java.template
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.systeminfo;
diff --git a/scripts/versiontemplates/ReactNativeVersion.js.template b/scripts/versiontemplates/ReactNativeVersion.js.template
index 357625b87230c7..1f1ccdd741dd32 100644
--- a/scripts/versiontemplates/ReactNativeVersion.js.template
+++ b/scripts/versiontemplates/ReactNativeVersion.js.template
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ReactNativeVersion
diff --git a/setupBabel.js b/setupBabel.js
index b581e0d3c16114..15e0f19a458bb2 100644
--- a/setupBabel.js
+++ b/setupBabel.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/third-party-podspecs/DoubleConversion.podspec b/third-party-podspecs/DoubleConversion.podspec
index 514194ed61040a..52f7ec1279f9c8 100644
--- a/third-party-podspecs/DoubleConversion.podspec
+++ b/third-party-podspecs/DoubleConversion.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
   spec.name = 'DoubleConversion'
   spec.version = '1.1.5'
-  spec.license = { :type => 'BSD' }
+  spec.license = { :type => 'MIT' }
   spec.homepage = 'https://github.com/google/double-conversion'
   spec.summary = 'Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles'
   spec.authors = 'Google'