am 1ebef2df: am 8e47355a: am 0a667dd4: am 8824eadc: Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit

* commit '1ebef2df9bb0331e16a1b29dd010e654657e95aa':