Merge "Add PreferencesFormPreSave hook"