Merge changes I073167c5,Ia55f9898 into main

* changes:
  Copy --remote-image-dir to instance directory
  Split the options and the paths returned by UploadExtraImages