Fix deadlock on v1 plugin with activate error Upstream-commit: 113e9f07f49e9089df41585aeb355697b4c96120 Component: engine