Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03 am: bf2fae3d

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

Change-Id: Ib0ec3fd5d761be15bbe7048d1e33e40fd8746d29