Merge "Don't assocaite starting window to task for overlay TF" into main