Merge "Use ERROR_CAMERA_DISCONNECTED on id remap" into main