Merge "Camera2: Combine API for deferred surface and shared surface"