Merge change I2c3621d1 into eclair

* changes:
  Fix desk dock getting stuck after unpairing.