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

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