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

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