Merge "Hide pip restoration property" into main