[graphql] Review all changes for correctness, possible inclusion in `master`

Part of #210556 (closed), go through changes and make sure any that can go on master are moved, and any refactoring is done before review.