Merge "Add a flag to cancelDragAndDrop to skip animation" into qt-dev
am: 84f4980bc2

Change-Id: I0659b19c731f44d0479566de5174fb14cbd56b3f