am 28ec8b4f: am 0a37981c: (-s ours) am 1b28d8d4: am d642de58: am ec4623d0: Improve text rendering and measurement. [DO NOT MERGE]

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