Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev