Merge "Speeding up testDragShortcutToMultipleWorkspaceCells in presubmit" into main