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

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