Merge "Prevent IndexOutOfBoundsException in PipTransition" into main