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