Merge "Make it easier to match SurfaceControl names when debugging" into main