Merge "Disconnect dock only if its connected." into gingerbread