Merge "Add missing extensions, fix scan of bad media files." into pi-dev