Merge "Fix for bug 6936752 Tamil text gets truncated on right-hand side" into jb-mr1-dev