Merge "Fix single-step in native thread"