Merge "Disable lockscreen using a system property."