Merge "Add CombinedMessageQueue#mNextBarrierToken" into main