Merge "Improve exit transition for task close case" into tm-qpr-dev