Merge "Add metrics constants for Night Display auto mode"