Sync to 12910
Fix crash when closing window in the middle of a race
Less load flicker