Merge "Pass old user options in PreferencesFormPreSave hook"