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 am: 99145e9e am: f10b91a7

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

Change-Id: I64260d12de2d95446020058d6d98f04e05edbb52