Merge change I2b7c8a32 into eclair

* changes:
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.