Merge "Remove PreferencesFormLegacy.php"