Merge "Default payment settings to disabled" into nyc-dev