Merge "Use WallpaperPicker2Lib" into main