Merge "Conserve expansion after re-inflation"