Merge "Remove obsolete "next component" field from WallpaperData" into main