Revert "Remove DisplayCalibration"

This reverts commit 7eae1fbf685853090db6c388fe5cc4291ccaf414.