Merge "HLS: allow audio/subtitles to appear after bitrate variants" into nyc-dev