Merge "[Contrast] Migrate contrast settings into Display" into main