Merge "Only show notoken as possible API error once"