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