Merge "Fix NPE when instantiating SettingsPreferenceFragment"