integ-cli: Add a few missing context cleanups Upstream-commit: 082b7726e22c4e7e161cb715158675ed24fc3e4c Component: engine