Merge "Fix racing for mIsFromTransactionItem" into main