merge

Restored support for BUILDKIT_PROGRESS. #1419

Job	Run time
bin-image	13m 12s
Build and test (desktop-windows, plugin)	1s
Build and test (desktop-macos, plugin)	15m 16s
Build and test (desktop-m1, plugin)	1s
desktop-edge-test	6s
	28m 36s

Provide feedback