Merge "Make HardwareRenderer able to target generic Surface objects"