Merge "Use reentry size to calculate PIP entry bounds"