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