Fix duplicate layers in exported tar Upstream-commit: 98094460602130039a8ae576ca2b5a559d1bd274 Component: engine