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