Merge "Remove fix_pip_restore_to_overlay flag" into main