Merge "Update night display intensity coefficients" into oc-mr1-dev