Its very much a lottery. My dealer said they wouldnt bother with the nismo and pop charger and indeed, although all my warranty claims were unrelated to this they didnt mention it.
I wouldnt be certain that all dealers would be as easy going though. The clicky axle repair shouldn't mean the K1 is an issue. I would tend to ask them up front. Others will disagree.