Merge "Add multi-device tests to dispatcher" into main