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

Change-Id: Id3c38bf0f288ec55bdedb2029eac7c713773c4a9