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: I5a770f682e6c8e48f854fb54c5e06dce1e7d931e