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