Merge change 22478 into eclair

* changes:
  DockObserver: minor cleanup.