Merge "Fix underruns when fast track denied due to SRC" into klp-dev