Merge "Fix CrossAppDragAndDropTests failed" into tm-dev