Fix up a little and include the deviceId in the intent.