Merge "Revert "Fix instrumentation frame check with inlining""