Merge "Fix SpecialPasswordResetOnSubmit parameter handling"