Merge "Making old apps passing null ClipData to startDrag work again."