Merge "Remove toast window token after being rate-limited"