Merge "Migrate PaymentSettings to DashboardFragment"