Merge "Replace PreferencesFormLegacy usages with PreferencesFormOOUI"