Merge "CameraService: fix camera removal paths"