Merge "Do not create starting window if there is no task." into tm-dev