Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit