Required city field is blocking node edition and deletion when using multiple field_address fields

We are using addressfield_autocomplete widget in a multiple Postal address field. We have set the following configurations for the field:

• Address form (country-specific): TRUE
• Hide the postal code: TRUE
• Hide the street address: TRUE
• Hide the country when only one is available: TRUE
• Organisation (single line): FALSE
• Name (First name, Last name):FALSE
• Name (single line): FALSE
• Make all fields optional (Not recommended): TRUE
• Default country: Canada
• Available countries: Canada
• Show map: TRUE
• Reveal widget: FALSE
• Place types: (cities)
• HTML5 geocode: TRUE
• Draggable markers: TRUE
• Visible markers: TRUE
• Reverse geocode: FALSE

After creating a node with one or more address (cities), when the user tries to edit it:

1. Edit form opens with a new empty address item (this is standard Drupal behavior for multiple fields)
2. The user cannot delete this new address he does not need (because there is no delete option for address items on the multiple field)
3. User clicks Save or Delete
4. Error message "City field is required." is displayed, because the new address item was not set
5. It is not possible to save or delete the node

This happens because, in line 399 of addressfield_autocomplete_field_widget_form method, locality field is set as required, even though "Make all fields optional" option is enabled.