Merge "Update night display intensity coefficients"