Merge "Don't always send hdr headroom in SurfaceView" into main