Blank Billing Address set as Primary

This is on Drupal 7.69, CiviCRM 5.21.1, Webform 7.x-4.21 and Webform CiviCRM Integration 7.x-5.0.

I have a Webform which creates a new Individual Contact, linked by a Relationship to a Household Contact. The Household has a Membership (which flows down to the Individual), and the Household (Home) Address is also shared with the Individual.

When I create a new Individual and Household, and pay for a Membership with the Dummy Card Payment Processor, the Individual ends up with a blank Billing Address as the Primary address, and the shared Home Address as a second address. This is a significant use-case because we are also using a custom Payment Processor (effectively just a clone of the core default implementation) to record Cash or Cheque payments, and this shows the same behaviour.

If no payment is taken, or it is taken by Pay Later the Individual ends up with a single Home address, being the primary location.

The attached patch file fixes this problem, though has not been fully tested in all other possible cases.

Tony