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