Merge "Layout improvements for RTL and font size."