am b34fe2f0: am 60607a90: Make sure that when the screen is off, we don\'t try...

am b34fe2f0: am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too.

Merge commit 'b34fe2f0'

* commit 'b34fe2f0':
  Make sure that when the screen is off, we don't try to turn the buttons on too.