Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev