Merge "Add comment regarding keeping TRACE_DUMP_TIMEOUT_MS in sync"