Merge "Prevent offload underrun during active playback."