am 5c9fb641: (-s ours) Reconcile with klp-release - do not merge

* commit '5c9fb641d93fa6758978adfb02cc0f2a51d02bdc':
  Fix regression for AudioRecord streaming callback mode