Merge "Add DeleteUnknownPreferences hook"