Merge "Handle device context with invalid deviceId"