Merge "[Accessibility] Address UX comments for the contrast screen" into main