Merge "Correctly calculate top corner radius" into sc-dev