Merge "Implement CameraIdRemapping in CameraManager" into udc-qpr-dev