Merge change I081f08c1 into eclair

* changes:
  A better solution for ignoring user activity while the screen is animating off.