Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev