Merge "Don't take mLock in handleUnlockUser()."