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