Merge "Refactor display adjustments into their own utils class"