am a41ff4b7: am c867958e: am d376d240: Merge change I081f08c1 into eclair

Merge commit 'a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb'

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