Merge "Implement Camera Id Remapping in CameraService" into main