Merge "Fix that InputDeviceReaderThread that got killed during startup"