am 791044c2: am 6788e028: Merge "Fix bug #6480486 Zero width non-joiner and...
am 791044c2: am 6788e028: Merge "Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly" into jb-dev
* commit '791044c2':
Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly