Merge "Make "Undo" button not be long-clickable explicitly." into main