Fix container mount cleanup issues Upstream-commit: c7b63338f0c46b2ca0efee3b8a590c2e2033ea14 Component: engine