am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.

* commit '1c91b1f7a2da5e5b1996217228399ef958c2be0c':
  Improve text rendering and measurement.