Merge "Add more rounded corners tests" into sc-dev