Merge "Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: 5784bbd8b2" into rvc-qpr-dev-plus-aosp