Resolve #2871483 "Checkout payment settings reroll"

Damien McKennarequested to merge
issue/commerce-2871483:2871483-checkout-payment-settings-reroll into 3.x

Closes #2871483

Merge request reports