Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5

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

Change-Id: I8385e736cac5d40f89803e37d8c3b58121426a79