am d376d240: Merge change I081f08c1 into eclair

Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-plus-aosp

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