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