Merge "Don't treat failed scans as valid media files" into pi-dev