Merge "Conserve expansion after re-inflation" into pi-dev