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

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