am 6c5febdb: am 90869c2b: Merge "HLS: fix freezes when toggling between a/v streams" into lmp-dev

* commit '6c5febdb65ce11ec50ba1d5197db2226a39d135f':
  HLS: fix freezes when toggling between a/v streams