Merge "Update keyguard API"