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