Merge "Re-enable the testDragCustomShortcut test in pre-submits" into main