Merge "Auto resize to min size if pip too small" into main