Merge "Add option to disable lockscreen by default"