Merge "HLS: fix freezes when toggling between a/v streams" into lmp-dev