Merge "Settings: AF Translations" into cm-11.0