Merge "Re-apply local client state when leash changes" into rvc-dev am: 9c50a64e91

Change-Id: Idbe4ab483b7cfaaf35c1af2f7b49061c6cb534cf