fix: #3633498 Follow-up of #3438654: Checkout flow saves a stale order and collides with the order lock held by a parallel shipping recalculation

Closes #3633498