Merge "Only use single UpdateThread."