Merge "Reuse --remote-image-dir" into main