Merge "Only skip frames for local unwinds."