Merge "Delay migration until after user is prepared." into nyc-dev