Merge "Fix interaction between instrumentation and jit lock." into nyc-dev