Moved listenercalls for highlights
Fixed NullPointerException when not connected to any channels
Merge branch 'feature/fix-highlight-issue' into develop