Merge "Camera: Remove flag 'surface_leak_fix'" into main