Merge "[Settings] Update component color to respect contrast in v34+" into main