Merge "Fix legacy disconnect callback." into mnc-dev