am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev

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