Aggregate Undo Actions

Added a class and helper for aggregating undo actions together.
Resolving conflict
Bug fixes
Merge branch 'feature-aggregateUndo' into explore-local-dist_aggregateUndoConflict
Adjust redo order.
Merge branch 'feature-aggregateUndo' into explore-local-dist_aggregateUndoConflict
Bug Fixes
Merge branch 'feature-aggregateUndo' into explore-local-dist_aggregateUndoConflict