Merge "Revert "Introduce ActivityTransactionItem and reduce null checks""