Merge "Fix flakiness of testNativeCrash" into main