Refactor cleanup of paused test containers Upstream-commit: 6b94be3521290a791a641df2528def86925ba6ff Component: engine