#18 Fixed DI in SelectionTool (including EditationListeners circular reference)