Merge "Break split when entering pip if transition contains closing changes" into main