Merge "overlay: Reset pipes on config failure"