am f4963af4: Merge change 2339 into donut

Merge commit 'f4963af4ed00afc31b6c5fddc767995aafe2c465'

* commit 'f4963af4ed00afc31b6c5fddc767995aafe2c465':
  We're not displaying the album name anymore in the 'songs' list, so it's a little strange to filter on it.