Merge change I7b8b6cfb into eclair

* changes:
  Do not force screen on when undocking from the desk dock.
tree: a9acd18ab5526d297928f96c094ca22eaa33e593
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE