Merge "Clear pipe after onRestoreFile is called" into main