[v0.16] cherry-picks for v0.16.0 #4745

Job	Run time
build (windows/amd64)	1m 37s
build (freebsd/amd64)	1m 49s
test-freebsd-amd64	21m 7s
test-windows-amd64 (containerd, ./client)	3m 42s
test-windows-amd64 (containerd, ./cmd/buildctl)	7m 59s
test-windows-amd64 (containerd, ./worker/containerd)	3m 46s
test-windows-amd64 (containerd, ./solver)	3m 10s
test-windows-amd64 (containerd, ./frontend)	2m 42s
test-windows-amd64 (containerd, ./frontend/dockerfile)	12m 47s
test-windows-amd64 (./..., 1)	15m 48s
	1h 14m 27s

Provide feedback