[v0.13] cherry-picks #2871

Job	Run time
prepare	1s
test / prepare	1m 44s
test / run (containerd, ./frontend/dockerfile, integration)	4m 44s
test / run (containerd, ./frontend/dockerfile, dockerfile)	6m 39s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	4m 54s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	8m 28s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	5m 15s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	6m 20s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	6m 6s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	8m 11s
test / run (oci, ./frontend/dockerfile, integration)	4m 49s
test / run (oci, ./frontend/dockerfile, dockerfile)	5m 53s
test / run (oci-rootless, ./frontend/dockerfile, integration)	4m 40s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	5m 16s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	4m 29s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	6m 4s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	5m 47s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	5m 46s
image (mainline)	8m 49s
image (labs)	5m 47s
release	0s
	1h 49m 42s

Provide feedback