Merge "camera: Fix client eviction/disconnect race."