Merge "Fixed the text alignment with RTL text" into oc-dr1-dev