Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev