Merge "Remove Wallpaper duplicate from setting search" into oc-dev