Merge "Don't try to register (and invoke!) intentional null callbacks" into nyc-dev