Merge "Fix CTS failure with rounded corners" into oc-dr1-dev