Merge "Add flag to subscribe trust manager to primary auth events" into main