Merge "Allow multiple calls and names to filter in SurfaceControlRegistry" into main