Merge "KV] Don't set current token if no data was moved"