am 6788e028: Merge "Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly" into jb-dev

* commit '6788e028c363583406d513d66d9a78576f984302':
  Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly