Merge "Support SurfaceControlRegistry logs in native" into main