am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev

* commit '5a1250532f159842c364accf02bcfd111a6b900b':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]