Fonts: avoid baking ExtraSizeScale twice into Ascent/Descent. (re)

Reapply 1bcc23e + offset for our current internal font using it.
2 files changed