Merge change I82be95f6 into eclair

* changes:
  Feature #2296147	Settings for Car/Desk Dock on certain devices