Merge pull request #13456 from lockiechen/fix/draft-save-error-message-13454