Merge "Add support for locking the screen when the lid is closed"