Merge "Introduce write lock for mDragState"