Merge "Fix for bug 6872613 Need to revert back to a less hacky Arabic Font" into jb-mr1-dev