Merge "Make CombinedMessageQueue pick an implementation per instance" into main