Merge "Replace TypeQueueCheckAndPushBack with TypeStackGuard"