am 0faefb72: (-s ours) am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic

* commit '0faefb72fb8917c9408f7b71c2bac5a9d5f264c2':
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic