Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev