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

* commit 'badf5a9442e639dc6ae2c4794c202143f6d2f16d':
  Fixed text rendering issue with spans.