Merge "Add app_name to keyguard package."