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

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