Merge "Restoring the full set of combinations in testDragShortcutToMultipleWorkspaceCells in presubmit" into main