Merge "Move reentry state into PipBoundsState"