Merge "Including WallpaperPicker in SDK build" into oc-dev