Merge "AF: Fix display of units." into cm-11.0