am c867958e: am d376d240: Merge change I081f08c1 into eclair

Merge commit 'c867958eb6fb50210a767fa24757bfa19228c22e' into eclair-mr2-plus-aosp

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