Merge "Disconnect TrustAgent when not active." into lmp-dev