Merge "Associate starting window with task once a TF is added" into tm-qpr-dev