Merge change 26527 into eclair

* changes:
  Dock screen on config can now select AC or USB.