Sync JSX tags from upstream

This is the other part of fc5f7e0e85e164f6826cf1ddc3f055f6ee4f93cb. This
file isn't part of our sync process so needs to be done separately.