Merge "Settings: HU translation" into cm-10.2