Merge "Merge "Support native and srgb for night display" into oc-dr1-dev am: 37082aa5 -s ours" into oc-mr1-dev