fix interaction between customer location change and supplemental packages, #23124