Merge "Add TaskFragment token to TransitionFilter" into main