Merge "Fix the JIT blocking mode to unblock itself."