Merge "Fix NPE in SettingsProvider."