am ec4623d0: Improve text rendering and measurement. [DO NOT MERGE]

* commit 'ec4623d0d47734c21ee915ea6ec58e60f668bd2f':
  Improve text rendering and measurement. [DO NOT MERGE]