Merge proposals dependent on lp://staging/~markjtully/ubuntu-app-review-board/unity-scopes-music-extras-precise

1. unity-scopes-music-extras-precise
2. Dependent merge proposals