Merge "Fix layout rendering for RTL locales" into jb-mr2-dev