First part of https://github.com/facebook/react/pull/26571 merging separately to help with git history with a lot of file renames