Merge proposals dependent on lp:~stolowski/unity-scope-mediascanner/fix-albums-of-artist-vivid

1. fix-albums-of-artist-vivid
2. Dependent merge proposals