Merge "Allow shell to disable keyguard when not secure" into mnc-dev