Merge "Allow system to disable lockscreen" into mnc-dev