Merge "Change night display auto mode Validator type"