Merge "Add metrics for logging SurfaceControl events" into main