Merge "Revert^2 "Add a holdback study for concurrent MessageQueue."" into main