Merge "Ensure that we always have a useable wallpaper token for animation" into main