Merge "Use a less misleading name for the code that sets up the main thread."