Merge "Fix handling in DisconnectingState" into ics-mr0