Merge "Add missing unregistrations when a connection ends." into mnc-dev