am 8f7e3e0f: Merge "AlbumArt image of songs in the non-primary storage root dir are images in the same dir"

* commit '8f7e3e0f996494cca5054005b9befa456e1087e1':
  AlbumArt image of songs in the non-primary storage root dir are images in the same dir