Merge "Fix a compile warning in the Surface class."