Merge "Update fgs time limit reset logic." into main