Merge "Delete legacy transition code from StageTaskListener" into main