Merge "Don't add wallpaper activity to list of tasks" into main