It's hard since you're not running the new Flow, but going forward would appreciate if you could try to make sure to parameterize all tShape and React.use* calls to avoid introducing new work for me.
NOTE: CI will fail on this diff. I considered the possibility of fixing Flow errors BEFORE upgrading Flow, but it wasn't possible... in some cases, the fixes to support the new version of Flow caused errors in the old version. I could have hidden these type errors with $FlowFixMe lines and then later revert those, but that seemed like too much busy work.
Depends on D9748