am c3295802: Merge "New users need a wallpaper_file type."

* commit 'c3295802d7fb22213c073705480d1c1314d71d27':
  New users need a wallpaper_file type.