am 1a3908e9: Merge "Switch to a type-safe album art interface."

* commit '1a3908e95926acd8add3858be571fe23fa9d047a':
  Switch to a type-safe album art interface.