"Switching to a new device" regressed on 128