Merge "Offer a type-safe album art interface."