Merge "Fix alignment issues with RTL paragraphs."