Merge "Implement Camera Id Remapping in CameraService" into udc-qpr-dev