am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev

* commit 'a457211af55b2ad5bc58f4228ceb147ac22c92b0':
  Fix getBuiltInWallpaper method