[HEAD MERGE] Refactor viewer streams

Signed-off-by: David Goulet <dgoulet@efficios.com>