Merge "Remove cover art's dependency on external storage"