Merge "Allow current profiles to disable keyguard"