Merge "Fix random main loop crashes."