Merge "Fix instrumentation frame check with inlining"