Merge pull request #4742 from crazy-max/v0.13_cherry-picks #2634

Job	Run time
prepare	1s
test / prepare	1m 54s
test / run (containerd, ./frontend/dockerfile, integration)	4m 29s
test / run (containerd, ./frontend/dockerfile, dockerfile)	7m 52s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	4m 28s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	7m 49s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	5m 1s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	5m 53s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	4m 56s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	6m 34s
test / run (oci, ./frontend/dockerfile, integration)	4m 4s
test / run (oci, ./frontend/dockerfile, dockerfile)	5m 33s
test / run (oci-rootless, ./frontend/dockerfile, integration)	4m 32s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	5m 26s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	4m 9s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	7m 8s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	4m 28s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	5m 10s
image (mainline)	4m 39s
image (labs)	4m 49s
release	0s
	1h 38m 55s

Provide feedback