Merge "Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs"