[v0.17.3] cherry-picks #4993

Job	Run time
prepare	1s
test / prepare	9m 17s
test / run (containerd, ./frontend/dockerfile, integration)	5m 12s
test / run (containerd, ./frontend/dockerfile, dockerfile)	13m 58s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	4m 41s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	13m 56s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	4m 55s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	8m 54s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	5m 18s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	9m 36s
test / run (oci, ./frontend/dockerfile, integration)	4m 22s
test / run (oci, ./frontend/dockerfile, dockerfile)	6m 32s
test / run (oci-rootless, ./frontend/dockerfile, integration)	4m 49s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	12m 21s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	4m 13s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	11m 18s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	4m 31s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	11m 2s
image (mainline)	5m 3s
image (labs)	5m 12s
scout	0s
release	0s
	2h 25m 11s

Provide feedback