Merge "Remove Wallpaper duplicate from setting search" into oc-dev
am: 564b965ccc

Change-Id: I955360c67d040a7c05685e8928e54dc6ac1109b6