Creating New Individual via quick add block fails if after adding you try to add a phone number

This might be related to CRM-5151, because what happens is we first get the error described in that issue, and then you fill out the phone number field, and then you get the error "One Phone should be marked as primary", but there is no place to mark a phone as primary.