Merge "testDragToFolder is stable; promoting to presubmit" into main