am 9c0dfa09: Merge "Eliminate latency when resampling is disabled" into klp-dev

* commit '9c0dfa09731a8366a7cdcd7171dde64b73af0d5c':
  Eliminate latency when resampling is disabled