Merge "Add PipTransitionState into pip2" into main