Merge "Add a timeout for disconnecting devices to recover from error situation"