Merge change I7b8b6cfb into eclair

* changes:
  Do not force screen on when undocking from the desk dock.