am 4c268a32: am badf5a94: Merge "Fixed text rendering issue with spans." into jb-dev

* commit '4c268a32714fefe141d093abb59806a2d6f2991c':
  Fixed text rendering issue with spans.