Fixes for Surface refactor for iOS Sim CaptureDummy