Merge "Refactor task listeners mapping in ShellTaskOrganiser"