Merge "Add a flag to guard new MessageQueue test apis" into main