Merge "Add GlobalBundleScanningSchemaServiceImpl.destroyInstance for cleanup in tests"