Merge "Fix WallpaperWindowToken visible update with Shell transition"