Merge "MediaScanner: disable album artist support until MediaProvider really supports it"