Merge commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54' * commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54': Disconnect dock only if its connected.
Merge commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54' * commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54': Disconnect dock only if its connected.