Merge "DeviceFlowRegistryImpl can't be static"