Merge "Fix deadlock between attachSystemDataTransport and addOnTransportsChangedListener." into main