Merge "Apply the desired HDR headroom when creating the SurfaceView's surface" into main