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

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