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

* commit '56b86debcfaf8f661011702d31854bb3804f5fe1':
  Improve text rendering and measurement.