Merge "STL make DragController.onStop a suspended function" into main