Merge pull request #9096 from jordan-woyak/calibration-cleanup ControllerEmu: Improve and simplify UpdateCalibrationData.
