Merge "Fix integration tests with multi-desks on" into main