am 6e371787: Re-schedule screen saver mode when returning to normal.

Merge commit '6e37178770f41ffcf8013e9460170140bcc6c130' into eclair-plus-aosp

* commit '6e37178770f41ffcf8013e9460170140bcc6c130':
  Re-schedule screen saver mode when returning to normal.