fix undoTransaction
also remove from popup tray when undoing transaction
fix undoTransaction
also remove from popup tray when undoing transaction
Merge branch 'bugfix' into develop