Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev