Revert "Eliminate DisplayColorCalibration tunables"