Merge "Re-apply local client state when leash changes" into rvc-dev am: 9c50a64e am: 125072dc am: d0d74de7 Change-Id: I99a2643b894f69e450fe85782e4e2f3b994d156c