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

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