Merge "Fix NPE in PersonalPreferencesFragment"