Imrpoves robustness of video routing.

- Improves robustness of video routing and data channel message emission.
- Improves code readability and removes duplicate and/or unnecessary code
- Fixes problems introduced by yesterday's commit.