Merge "Fix handling of error messages from the 'SpecialPasswordResetOnSubmit' hook"