Merge "ApiUpload: Better handle ApiMessage errors from UploadVerifyFile hook"