Merge "Make test 1935 avoid entering jit code before test thread starts"