Merge "Call disconnect / connect without checking the current status" into gingerbread