Add zero-width non-joiner to fix Arabic ligature issue affecting Firefox users

Bug: 60916
Change-Id: I49f3458e7c7f9f687750285c12993f82fae2d6a1
Merge "Add zero-width non-joiner to fix Arabic ligature issue affecting Firefox users"