Merge "Remove calls that iterate on MessageQueue" into main