Merge "Disabled Animations for Brightness Dialog" into main