Merge "Revert "Clear all DragView in onSaveInstanceState""