PreferencesActivity tweaked for V2 support