Merge "Re-apply local client state when leash changes" into rvc-dev