Merge "Fixed incorrect rounded corner size" into rvc-dev am: ae370867 am: cc47c44c am: 29cac597 Change-Id: I5ad7692e4477e545926d16197795dba80908831c