Merge "Keeping migration dialog up while migration in progress" into nyc-dev