am ce22440d: Fix text rendering [DO NOT MERGE]

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