Merge "Round 3: Fix flakiness of testNativeCrash" into sc-v2-dev