Merge "Fix carrier text rtl alignment" into oc-mr1-dev