am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev

* commit 'dd4efc22c736973ecfa1b7b4af9e71f971dd48b3':
  Fix text rendering