Merge "UploadFromStash: Only remove stashed file on successful uploads"