Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev