Merge "Add FreeformTaskTransitionHandler" into tm-qpr-dev