Merge "Add flag to guard wallpaper token transition change" into main