Merge "When reconnecting disassociate dc and apnContext." into jb-dev