Merge "Fix NPE in ContextHubTransactionManager" into main