Merge "update wallpaper window surfaces at same time as token" into main