Merge "Fix the Night Light page UI shrinking" into rvc-dev