Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread