Merge "Disable expanding pip when pip is not visible" into main