Merge "Changed Night display strings to "Night Light""