Merge "Fix NPE caused by orphaned child sessions"