Merge "Stop resetting app drag drop state when startDrag is invoked twice."