Merge "Fix ANR in MediaProvider during database migration"