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

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