Merge "Method to avoid skipping frames for local unwinds."