am f047c14f: Merge "Make media scanner use new delete-parameter"

* commit 'f047c14f23abd94b3fb04f56dded13b66236ca53':
  Make media scanner use new delete-parameter