Merge "Moving dim handling to DisplayDimModifier" into main