Merge "SF: Split DisplayTransactionTest"