Merge "Fix for bug 8911390 RTL text alignment is changed ..." into jb-mr2-dev