Merge "ImageExporter: Accept and store UUID as ImageUniqueId in output"