Merge "Don't unconditionally disable dimming for transitions" into main