Merge "Fix rounded corners fangs in RTL" into oc-dr1-dev