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

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