Merge "Don't disconnect the same device before connecting." into gingerbread