Update font metrics
Fix builtin device font metrics
Merge pull request #1913 from tobytailor/text

Just another font metrics update