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

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