Merge "LogoutAction should store current user id before swithcing"