Merge change 25089 into eclair

* changes:
  DockObserver wakes the display when broadcasting a change 	- normal display timeout applies after wake