Merge "Allow disabling the lock screen when multiple users are present"