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

* commit 'a98b35c260a8527dd7a952fe0dd3342fce06b89a':
  Keeping migration dialog up while migration in progress