Merge "HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly" into nyc-dev