Merge "Allow SurfaceControlRegistry to be able to update at runtime" into main