am 45dbfcc7: Improve text rendering and measurement.

* commit '45dbfcc781a3926d22571b6ccfa3f27ec896f119':
  Improve text rendering and measurement.