Merge "Move TtyMode into its own ListPreference class." into lmp-mr1-dev