Merge "Add trunk stable flag for overlay restoration from pip" into main