Merge "[Bugfix] avoid deadLock caused by onAuthenticationPrompt()" into main