Avoid extra mount/unmount during container registration Upstream-commit: da3e53913388ebc89066bb5de06bcebc2e6c5854 Component: engine