Implement album list merging as discussed in #537