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