Merge "Skip collecting requesting-invisible wallpaper if no target" into main