Merge "Fixed incorrect rounded corner size" into rvc-dev