Fix panic during shutdown when using channel

[rf-figma]

This PR reverts the revert of #932, adding a second commit that should fix a related race condition that was causing a build failure.

[kjvalencik]

Merged via https://github.com/neon-bindings/neon/commit/000b6c532452c46a22ac1c131952f84159a59001