Merge "Clear all DragView in onResume" into tm-dev