Merge "Set the brightness to zero on screen-off" into jb-mr1-dev