Merge "DragState: fix the NPE problem." into main