Merge "Use default val in night display repo for auto mode" into main