Merge "Use ESTIMATE_DB_APPLY for total transaction time estimate"