[generic] Improve Livestream detection (closes #2234)