Merge pull request #4779 from tonistiigi/v0.13.1-picks #2700

Job	Run time
prepare	1s
test / prepare	1m 52s
test / run (containerd, ./frontend/dockerfile, integration)	4m 33s
test / run (containerd, ./frontend/dockerfile, dockerfile)	12m 44s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	4m 54s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	11m 16s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	5m 6s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	11m 0s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	5m 3s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	6m 9s
test / run (oci, ./frontend/dockerfile, integration)	4m 39s
test / run (oci, ./frontend/dockerfile, dockerfile)	10m 57s
test / run (oci-rootless, ./frontend/dockerfile, integration)	4m 0s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	12m 37s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	4m 2s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	8m 48s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	10m 19s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	11m 28s
image (mainline)	4m 53s
image (labs)	5m 2s
release	0s
	2h 19m 23s

Provide feedback