Correctly deal albums of same name and with disc number when "Treat
multi-disc sets as multiple album." is set.
Merge branch 'public/7.8' into public/7.9