Merge "Fix NPE in onTransactionResponse callback" into main