Merge pull request #13415 from lockiechen/fix/flow-timer-start-params-13413