Merge "Stop rounded corners from confusing magnification" into oc-dr1-dev