Merge "Instruct stashed upload failures to reupload file"