Merge "HLS: gracefully handle illegal buffer sizes" into nyc-dev