Merge "Don't kill subcontext if it's null"