Merge "Add the `testDragCustomShortcut` back for phones." into main