Merge "HLS: faster switching and pause/resume on low buffer"