Merge "Make rounded corners handle color inversion" into oc-dr1-dev