Merge "Fix the flickering on display/font size page" into sc-dev am: 11c602bdf2
am: d33c3c4886
am: 7475c9b7e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15233450 Change-Id: I77c7a0826d221b9272f3d2e4e9dfd62fb20ff572
This commit is contained in: