am 6afc0e24: am ee98610f: Merge "Set the brightness to zero on screen-off" into jb-mr1-dev

* commit '6afc0e2437bbbafe06b22f9d61fb5763c30e69bb':
  Set the brightness to zero on screen-off