Move closeNotify to fix panic with newer golang Upstream-commit: b6be6451971afc7798c1aa22ff73d681c4e0019b Component: engine