Merge "Support native and srgb for night display" into oc-dr1-dev