Merge "Unregister cred mng app KeyChain API" into sc-dev