Merge proposals dependent on lp://qastaging/~ahayzen/music-app/fix-1510225-use-save-load-playlist

1. fix-1510225-use-save-load-playlist
2. Dependent merge proposals