Merge "Fix races in timer trigger tests."