Merge "Allow none lockscreen with multiple users"