Merge "Finish support for third-party wallpaper pickers" into jb-ub-gel-agar