Merge "Improve SurfaceControlRegistry logging for applied transactions" into main