am ffba5739: am d60d0c1c: (-s ours) am f5512973: am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]

* commit 'ffba573994c160f38a497ddc16552cfdc1f60063':
  Fix text rendering [DO NOT MERGE]