Billing address set to primary when making contribution via webform

I appear to still have the problem described in Issue https://www.drupal.org/project/webform_civicrm/issues/2947955 → , even though it is described as fixed.

This is on Drupal 7.67, CiviCRM 5.13.4, Webform 7.x-4.19 and Webform CiciCRM Integration 7.x-4.26.

I have a Webform which creates a new Contact, with a single Home address (Home is the default), and takes a Contribution to pay for a Membership. If no payment is taken, or it is taken by Pay Later the Contact ends up with a single Home address, being the primary location. If the payment is by (dummy) Card, two addresses are created with the Billing address set as the Primary Location.

I can add the Contact's Billing address to the Webform explicitly, with the Home address as the first, primary, one and the same thing happens.

The only possible difference I can see to the situation reported as fixed in Issue 2947955 is that the Webform also creates a Household, of which my Individual Contact is a member, and the Individual's address is designated as Shared from the Household. Is there a timing problem here due to things being set up in a different sequence?