Merge "Camera: Combine handling of deferred surface and shared surface"