Merge "HLS: bandwidth estimator changes"