Merge "Fix bug #5371117 Regression : The Hebrew / Arabic text behavior in ICS latest build is wrong"