Merge in latest Spotify changes