Merge "Limit RemoteControlClient generation ID changes" into klp-dev