Merge "Settings: HU translation" into cm-11.0