Merge "Fix SurfaceControlRegistry log" into main