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

Change-Id: I42dcd5424fe67ddbb21d09defa14d9def104e4fb