Merge "Move dim bounds handling into dimmer" into main