Merge "Fix system_server's main thread name."