Merge "Skip collecting wallpaper to transition for non collected app" into main