Merge "Improve album art handling" into rvc-dev