am e74f0905: am 54dffa11: am d2f15728: am 772bbcc7: Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit

* commit 'e74f0905d4a7de2aa278a7ae3ad5d68eaa8eb6b1':