Merge "Break PreferencesFormOOUI->PermissionManager dependency"