Merge "Fix ANR when migrating large databases." into rvc-dev