Merge "Correct default payment selection behavior"