diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 48cecff..b0f8833 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -314,7 +314,7 @@
 		Dependencies: []string{BUNDLE_RECIPES_NAME},
 		Dimensions:   dimensions,
 		EnvPrefixes: map[string][]string{
-			"PATH": []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
+			"PATH":                    []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
 			"VPYTHON_VIRTUALENV_ROOT": []string{"cache/vpython"},
 		},
 		ExtraTags: map[string]string{
@@ -542,9 +542,9 @@
 					"GTX1070":       "10de:1ba1-24.21.13.9882",
 					"GTX660":        "10de:11c0-24.21.13.9882",
 					"GTX960":        "10de:1401-24.21.13.9882",
-					"IntelHD4400":   "8086:0a16-20.19.15.4835",
-					"IntelIris540":  "8086:1926-23.20.16.4982",
-					"IntelIris6100": "8086:162b-20.19.15.4835",
+					"IntelHD4400":   "8086:0a16-20.19.15.4963",
+					"IntelIris540":  "8086:1926-24.20.100.6229",
+					"IntelIris6100": "8086:162b-20.19.15.4963",
 					"RadeonHD7770":  "1002:683d-23.20.15033.5003",
 					"RadeonR9M470X": "1002:6646-23.20.15033.5003",
 					"QuadroP400":    "10de:1cb3-23.21.13.9103",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 8597ee6..bc9f4ac 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -33540,7 +33540,7 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4835",
+        "gpu:8086:162b-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -33656,7 +33656,7 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4835",
+        "gpu:8086:162b-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -33772,7 +33772,7 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4835",
+        "gpu:8086:162b-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -33888,7 +33888,7 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4835",
+        "gpu:8086:162b-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -34004,7 +34004,7 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -34120,7 +34120,7 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -34236,7 +34236,7 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -34352,7 +34352,7 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -34468,7 +34468,7 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -34584,7 +34584,7 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -35396,7 +35396,7 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4835",
+        "gpu:8086:0a16-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -35512,7 +35512,7 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4835",
+        "gpu:8086:0a16-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -35628,7 +35628,7 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4835",
+        "gpu:8086:0a16-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -35744,7 +35744,7 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4835",
+        "gpu:8086:0a16-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -62691,7 +62691,7 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4835",
+        "gpu:8086:162b-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -62807,7 +62807,7 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4835",
+        "gpu:8086:162b-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -62923,7 +62923,7 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4835",
+        "gpu:8086:162b-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -63039,7 +63039,7 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4835",
+        "gpu:8086:162b-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -63155,7 +63155,7 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -63271,7 +63271,7 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -63387,7 +63387,7 @@
         "Build-Win-Clang-x86_64-Debug-OpenCL"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -63503,7 +63503,7 @@
         "Build-Win-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -63619,7 +63619,7 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -63735,7 +63735,7 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -63851,7 +63851,7 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -63967,7 +63967,7 @@
         "Build-Win-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:1926-23.20.16.4982",
+        "gpu:8086:1926-24.20.100.6229",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -64779,7 +64779,7 @@
         "Build-Win-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4835",
+        "gpu:8086:0a16-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -64895,7 +64895,7 @@
         "Build-Win-Clang-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4835",
+        "gpu:8086:0a16-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -65011,7 +65011,7 @@
         "Build-Win-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4835",
+        "gpu:8086:0a16-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
@@ -65127,7 +65127,7 @@
         "Build-Win-Clang-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4835",
+        "gpu:8086:0a16-20.19.15.4963",
         "os:Windows-10-17134.191",
         "pool:Skia"
       ],
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index 773dd36..7c7cf75 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -292,7 +292,7 @@
     }
 
 #if defined(SK_BUILD_FOR_WIN)
-    if (kNvidia_VkVendor == properties.vendorID) {
+    if (kNvidia_VkVendor == properties.vendorID || kIntel_VkVendor == properties.vendorID) {
         fMustSleepOnTearDown = true;
     }
 #elif defined(SK_BUILD_FOR_ANDROID)