Merge "Check for race condition between onAuthenticated and taskStackChanged"