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

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