Merge "Add support for using the lid switch to turn off the screen." into jb-dev