Merge "Fix flaky test: testDataMigration_differentFromFallback" into main