Merge "Toast: Fix the concurrency problem of mAuthenticator"