Merge "Fix issue where surface corner rounding is ignored" into rvc-dev