Merge changes I66792c4d,I203b6783 into jb-mr2-dev

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