Merge "Remove thread shutdown logic."