Merge "Restore permission check in keyguard." into klp-dev