Merge "Extend FGS timeout for overlapping start"