Merge "Fix NPE in CombinedMessageQueue." into main