Merge "Fixes WallpaperPickerGoogle Studio build" into main