Fix race/deadlock in v1 plugin handlers Upstream-commit: 48ed4f0639d2f290603a04ec146beb3f9569280f Component: engine