Merge "Fix tokens for App Contrast Pill" into main