[v0.20] cherry-picks 0.20.0-rc3 #5513

Job	Run time
prepare	1s
test / prepare	6m 48s
test / run (containerd, ./frontend/dockerfile, integration)	10m 40s
test / run (containerd, ./frontend/dockerfile, dockerfile)	12m 31s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	10m 41s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	12m 35s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	10m 25s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	12m 23s
test / run (containerd-1.7, ./frontend/dockerfile, integration)	10m 40s
test / run (containerd-1.7, ./frontend/dockerfile, dockerfile)	12m 32s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	10m 45s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	12m 39s
test / run (oci, ./frontend/dockerfile, integration)	10m 1s
test / run (oci, ./frontend/dockerfile, dockerfile)	12m 14s
test / run (oci-rootless, ./frontend/dockerfile, integration)	10m 7s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	11m 32s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	10m 6s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	11m 48s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	10m 1s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	11m 24s
image (mainline)	5m 38s
image (labs)	5m 39s
scout	0s
release	0s
	3h 41m 10s

Provide feedback