Merge "Fix the orphan child session after abandoning the parent session"