Merge "Avoid confusing `main_thread` name" into main