Merge changes I7df1ff78,Ibc2e8adf into honeycomb

* changes:
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.