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

* commit '724ee71dbb1e7b1fcb8cd332663772c215eb7e63':
  Keeping migration dialog up while migration in progress