Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev