Merge "Make CombinedMessageQueue member names overlap with LegacyMessageQueue" into main