Merge "Fix screen selection issue for live wallpapers" into main