am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]

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