Improve layer downloading Upstream-commit: 683038bf57ce56c2f8eb433eb9bd00b2c17cae92 Component: engine