am 073dec19: am 22990fe1: Merge "Back to the old way of making sure that no more buffers are submitted" into klp-dev

* commit '073dec19db486290a02d9952e392df9cda5700ad':
  Back to the old way of making sure that no more buffers are submitted