Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread