Merge "Use SurfaceControl as token to register a SurfaceControlInputReceiver" into main