Merge "[Catalyst] Migrate Adaptive brightness in the DisplayScreen" into main