Merge change 4751

* changes:
  Remove code for getting and saving album art from the music app and use the media provider instead.