am 5747eebf: am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread

Merge commit '5747eebf6eb5ea91480dc576c45c752685383e37'

* commit '5747eebf6eb5ea91480dc576c45c752685383e37':
  Pressing the power button quickly needs to turn the screen on and off correctly.