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

* commit '772bbcc764a54ca513f946f70f249fd536ae84c3':
  Revert "Revert "Move wallpaper picker code to a separate directory""