Merge "Fix notifications undo system (2/2)" into main