Merge "Added default config to enable adding users from lockscreen"