Merge "Safely clean up the cover art manager" into rvc-dev