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

Change-Id: I23a6c8eb6911902fc9b9ecab8bb87e38c73371b5