am 8824eadc: Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit

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