am 54dffa11: am d2f15728: am 772bbcc7: Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit

* commit '54dffa118ca3b7439dae8431dd786073bc5fd8ce':
  Revert "Revert "Move wallpaper picker code to a separate directory""