Merge "Camera: Ensure correct error message for disconnected devices" into nyc-dev