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

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