Merge "Fix toggle display and preferen style old style and barely seen in...

Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793

Change-Id: I5b0f257d4d7b5b77f1fad721795809d482beaee1