Merge "Fixed RoundedCorner bugs" into sc-dev