Merge "Restore 'PreferencesForm' as alias for 'PreferencesFormLegacy'"