Merge "Add grace period to estimated launch times." into tm-dev