Merge "MediaScanner: Fix bug in "no media" handling logic"