Merge "Make disabledProviderList nullable"