Modified wait-for-then-drag-and-drop to wait for both elements to be present